blob: 379e9b38079a7a56782e41bcd78645c2c6b06a0e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Index: src/nm-device-802-3-ethernet.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v
retrieving revision 1.3
diff -u -r1.3 nm-device-802-3-ethernet.c
--- src/nm-device-802-3-ethernet.c 3 Jan 2006 17:47:38 -0000 1.3
+++ src/nm-device-802-3-ethernet.c 4 Jan 2006 17:13:33 -0000
@@ -328,7 +328,9 @@
/**************************************/
/* MII capability detection */
/**************************************/
+#define _LINUX_IF_H
#include <linux/mii.h>
+#undef _LINUX_IF_H
static int
mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location)
Index: src/nm-netlink-monitor.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v
retrieving revision 1.17
diff -u -r1.17 nm-netlink-monitor.c
--- src/nm-netlink-monitor.c 12 Aug 2005 19:06:09 -0000 1.17
+++ src/nm-netlink-monitor.c 4 Jan 2006 17:13:33 -0000
@@ -30,7 +30,7 @@
#include <linux/types.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
-#include <linux/if.h>
+#include <net/if.h>
#include <linux/unistd.h>
#include <unistd.h>
|
