From f3dde2d4057f5dfa5cbc9f1e3f13d596608b0b3b Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 12 Dec 2011 15:06:41 +0100 Subject: [PATCH] gnetworkmonitornetlink.c: Fix compilation on RHEL 6.2 When trying to compile glib master on a RHEL 6.2 system, it fails with: make[4]: Entering directory `/home/teuf/gnome/src/glib/gio' CC libgio_2_0_la-gnetworkmonitornetlink.lo In file included from gnetworkmonitornetlink.c:25: /usr/include/linux/netlink.h:35: error: expected specifier-qualifier-list before 'sa_family_t' gnetworkmonitornetlink.c: In function 'g_network_monitor_netlink_initable_init': gnetworkmonitornetlink.c:99: error: 'struct sockaddr_nl' has no member named 'nl_family' gnetworkmonitornetlink.c:100: error: 'struct sockaddr_nl' has no member named 'nl_pid' gnetworkmonitornetlink.c:100: error: 'struct sockaddr_nl' has no member named 'nl_pad' gnetworkmonitornetlink.c:101: error: 'struct sockaddr_nl' has no member named 'nl_groups' make[4]: *** [libgio_2_0_la-gnetworkmonitornetlink.lo] Error 1 sa_family_t is defined in sys/socket.h, this commit makes sure this header is included before netlink.h This fixes bgo bug #666001 --- gio/gnetworkmonitornetlink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c index 046c9e9..ecdc0d4 100644 --- a/gio/gnetworkmonitornetlink.c +++ b/gio/gnetworkmonitornetlink.c @@ -22,8 +22,6 @@ #include #include -#include -#include #include "gnetworkmonitornetlink.h" #include "gcredentials.h" @@ -36,6 +34,11 @@ #include "gsocket.h" #include "gunixcredentialsmessage.h" +/* must come at the end to pick system includes from + * gnetworkingprivate.h */ +#include +#include + static void g_network_monitor_netlink_iface_init (GNetworkMonitorInterface *iface); static void g_network_monitor_netlink_initable_iface_init (GInitableIface *iface); -- 2.7.4