From a04de2de904aa74dc7e4a8a5df231b1561b86b35 Mon Sep 17 00:00:00 2001
From: Nathaniel Russell <naterussell83@gmail.com>
Date: Wed, 6 Nov 2024 19:45:34 +0000
Subject: [PATCH] Revert commit 02172bda73663f63b603956a180c6c6fc6a3d187

- /gio/gnetworkmonitornetlink.c
- /meson.build
---
 gio/gnetworkmonitornetlink.c | 8 --------
 meson.build                  | 4 +---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c
index adaa77d38b..bf51d31f99 100644
--- a/gio/gnetworkmonitornetlink.c
+++ b/gio/gnetworkmonitornetlink.c
@@ -38,14 +38,8 @@
 
 /* must come at the end to pick system includes from
  * gnetworkingprivate.h */
-#ifdef HAVE_LINUX_NETLINK_H
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#endif
-#ifdef HAVE_NETLINK_NETLINK_H
-#include <netlink/netlink.h>
-#include <netlink/netlink_route.h>
-#endif
 
 static GInitableIface *initable_parent_iface;
 static void g_network_monitor_netlink_iface_init (GNetworkMonitorInterface *iface);
@@ -130,7 +124,6 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
       return FALSE;
     }
 
-#ifdef SO_PASSCRED
   if (!g_socket_set_option (nl->priv->sock, SOL_SOCKET, SO_PASSCRED,
 			    TRUE, NULL))
     {
@@ -140,7 +133,6 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
                    g_strerror (errsv));
       return FALSE;
     }
-#endif
 
   /* Request the current state */
   if (!request_dump (nl, error))
diff --git a/meson.build b/meson.build
index 7da293881e..69e4b036ea 100644
--- a/meson.build
+++ b/meson.build
@@ -400,12 +400,10 @@ headers = [
   'inttypes.h',
   'libproc.h',
   'limits.h',
-  'linux/netlink.h',
   'locale.h',
   'mach/mach_time.h',
   'memory.h',
   'mntent.h',
-  'netlink/netlink.h',
   'poll.h',
   'pwd.h',
   'sched.h',
@@ -463,7 +461,7 @@ if cc.check_header('malloc.h')
   glib_conf_prefix = glib_conf_prefix + '#define HAVE_MALLOC_H 1\n'
 endif
 
-if glib_conf.has('HAVE_LINUX_NETLINK_H') or glib_conf.has('HAVE_NETLINK_NETLINK_H')
+if cc.check_header('linux/netlink.h')
   glib_conf.set('HAVE_NETLINK', 1)
 endif
 
-- 
GitLab