diff options
| author | Jens Georg <mail@jensge.org> | 2022-10-25 23:47:01 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2022-10-25 23:47:57 +0200 |
| commit | 4b816847ca5bf57ddd06876fa0b482faa2a37e86 (patch) | |
| tree | 5b5c7b52a56a3b10a8d88ecd67b7a6206150463b | |
| parent | 6175fe91f240e0e17cb75dac548da4fa939456b3 (diff) | |
| download | gupnp-4b816847ca5bf57ddd06876fa0b482faa2a37e86.tar.gz | |
linux-cm: Fix IFA_FLAGS detection
| -rw-r--r-- | libgupnp/gupnp-linux-context-manager.c | 6 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libgupnp/gupnp-linux-context-manager.c b/libgupnp/gupnp-linux-context-manager.c index 2a76d09..1e4f748 100644 --- a/libgupnp/gupnp-linux-context-manager.c +++ b/libgupnp/gupnp-linux-context-manager.c @@ -126,8 +126,10 @@ dump_rta_attr (sa_family_t family, struct rtattr *rt_attr) case IFA_BROADCAST: label = "IFA_BROADCAST"; break; case IFA_ANYCAST: label = "IFA_ANYCAST"; break; case IFA_CACHEINFO: label = "IFA_CACHEINFO"; break; - case IFA_MULTICAST: label = "IFA_MULTICAST"; break; -#if defined(IFA_FLAGS) + case IFA_MULTICAST: + label = "IFA_MULTICAST"; + break; +#if defined(HAVE_IFA_FLAGS) case IFA_FLAGS: label = "IFA_FLAGS"; break; #endif default: label = "Unknown"; break; diff --git a/meson.build b/meson.build index f33ca7d..22cc880 100644 --- a/meson.build +++ b/meson.build @@ -16,11 +16,19 @@ bindir = join_paths(prefix, get_option('bindir')) netlink_available = cc.has_header('linux/rtnetlink.h') ifaddrs_available = cc.has_header('ifaddrs.h') +ifa_flags_exists = cc.compiles('''#include <linux/if_addr.h> +int main(int argc, char *argv[]) +{ + if (IFA_FLAGS) {}; + return 0; +}''', name: 'IFA_FLAGS is defined') + conf = configuration_data() conf.set_quoted('VERSION', meson.project_version()) conf.set('HAVE_NETLINK', netlink_available) conf.set('HAVE_IFADDRS_H', ifaddrs_available) conf.set('HAVE_LINUX_WIRELESS_H', cc.has_header('linux/wireless.h')) +conf.set('HAVE_IFA_FLAGS', ifa_flags_exists) glib_version = '2.70' add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') |