luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3630-netlink-linux' into 'main'

Browse Source 
build: Check for <netlink/netlink_route.h> for GNetworkMonitorNetlink

Closes #3630

See merge request GNOME/glib!4549
This commit is contained in:
Marco Trevisan 2025-03-10 12:24:22 +00:00
commit dc1b097f2d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gnetworkmonitornetlink.c
View File

@ -42,7 +42,7 @@
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#endif #endif
#ifdef HAVE_NETLINK_NETLINK_H #if defined(HAVE_NETLINK_NETLINK_H) && defined(HAVE_NETLINK_NETLINK_ROUTE_H)
#include <netlink/netlink.h> #include <netlink/netlink.h>
#include <netlink/netlink_route.h> #include <netlink/netlink_route.h>
#endif #endif

4
meson.build
View File

@ -417,6 +417,7 @@ headers = [
'memory.h', 'memory.h',
'mntent.h', 'mntent.h',
'netlink/netlink.h', 'netlink/netlink.h',
'netlink/netlink_route.h',
'poll.h', 'poll.h',
'pwd.h', 'pwd.h',
'sched.h', 'sched.h',
@ -475,7 +476,8 @@ if cc.check_header('malloc.h')
glib_conf_prefix = glib_conf_prefix + '#define HAVE_MALLOC_H 1\n' glib_conf_prefix = glib_conf_prefix + '#define HAVE_MALLOC_H 1\n'
endif endif
if glib_conf.has('HAVE_LINUX_NETLINK_H') or glib_conf.has('HAVE_NETLINK_NETLINK_H') if (glib_conf.has('HAVE_LINUX_NETLINK_H') or
(glib_conf.has('HAVE_NETLINK_NETLINK_H') and glib_conf.has('HAVE_NETLINK_NETLINK_ROUTE_H')))
glib_conf.set('HAVE_NETLINK', 1) glib_conf.set('HAVE_NETLINK', 1)
endif endif