/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (hide annotations) (download)
Sun Nov 13 23:19:00 2011 UTC (3 years ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Bump, drop old. First stable release in the 0.9.2 series.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

1 tetromino 1.1 commit 00f2b0a9bb806be64c5868af44f43dbe55bdd75b
2     Author: Thomas Graf <tgraf@redhat.com>
3     Date: Fri Sep 23 13:46:41 2011 +0200
4    
5     core: Include <linux/if.h> instead of <net/if.h>
6    
7     NM already includes <linux/if.h> in some places, f.e. nm-netlink-monitor and
8     we can't mix usage of the two. Stick to using <linux/if.h> as it provides
9     additional flag definitions such as operational link state and link mode.
10    
11     Signed-off-by: Thomas Graf <tgraf@redhat.com>
12    
13     [ Alexandre Rostovtsev <tetromino@gentoo.org>: remove parts of commit
14     unrelated to if.h changes. ]
15    
16     diff --git a/include/wireless-helper.h b/include/wireless-helper.h
17     index d150ef7..2e4509a 100644
18     --- a/include/wireless-helper.h
19     +++ b/include/wireless-helper.h
20     @@ -27,6 +27,6 @@
21     #include <sys/types.h>
22     #include <linux/types.h>
23     #include <sys/socket.h>
24     -#include <net/if.h>
25     +#include <linux/if.h>
26     #include <wireless.h>
27    
28     diff --git a/src/nm-device.c b/src/nm-device.c
29     index c0b1b87..559606c 100644
30     --- a/src/nm-device.c
31     +++ b/src/nm-device.c
32     @@ -25,7 +25,6 @@
33     #include <dbus/dbus.h>
34     #include <netinet/in.h>
35     #include <string.h>
36     -#include <net/if.h>
37     #include <unistd.h>
38     #include <errno.h>
39     #include <sys/ioctl.h>
40     @@ -34,6 +33,7 @@
41     #include <sys/wait.h>
42     #include <arpa/inet.h>
43     #include <fcntl.h>
44     +#include <linux/if.h>
45    
46     #include "nm-glib-compat.h"
47     #include "nm-device-interface.h"
48     diff --git a/src/nm-system.c b/src/nm-system.c
49     index 0b29468..473fcec 100644
50     --- a/src/nm-system.c
51     +++ b/src/nm-system.c
52     @@ -40,7 +40,7 @@
53     #include <netdb.h>
54     #include <glib.h>
55     #include <ctype.h>
56     -#include <net/if.h>
57     +#include <linux/if.h>
58    
59     #include "nm-system.h"
60     #include "nm-device.h"
61     diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
62     index 522c075..3546f8d 100644
63     --- a/src/ppp-manager/nm-ppp-manager.c
64     +++ b/src/ppp-manager/nm-ppp-manager.c
65     @@ -32,7 +32,7 @@
66     #include <sys/socket.h>
67     #include <sys/ioctl.h>
68     #include <asm/types.h>
69     -#include <net/if.h>
70     +#include <linux/if.h>
71     #include <sys/stat.h>
72    
73     #include <linux/ppp_defs.h>
74     diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
75     index 691a176..910cca3 100644
76     --- a/src/settings/plugins/ifcfg-rh/reader.c
77     +++ b/src/settings/plugins/ifcfg-rh/reader.c
78     @@ -28,10 +28,10 @@
79     #include <ctype.h>
80     #include <sys/inotify.h>
81     #include <errno.h>
82     -#include <net/if.h>
83     #include <sys/ioctl.h>
84     #include <unistd.h>
85     #include <netinet/ether.h>
86     +#include <linux/if.h>
87    
88     #ifndef __user
89     #define __user
90     diff --git a/src/wimax/iwmxsdk.c b/src/wimax/iwmxsdk.c
91     index ff6b553..9c3a78b 100644
92     --- a/src/wimax/iwmxsdk.c
93     +++ b/src/wimax/iwmxsdk.c
94     @@ -27,7 +27,8 @@
95     #include <stdlib.h>
96     #include <errno.h>
97     #include <string.h>
98     -#include <net/if.h>
99     +#include <sys/socket.h>
100     +#include <linux/if.h>
101    
102     #include <glib.h>
103    
104     diff --git a/src/wimax/nm-device-wimax.c b/src/wimax/nm-device-wimax.c
105     index b6afc27..6654140 100644
106     --- a/src/wimax/nm-device-wimax.c
107     +++ b/src/wimax/nm-device-wimax.c
108     @@ -23,7 +23,8 @@
109     #include <unistd.h>
110     #include <sys/ioctl.h>
111     #include <net/ethernet.h>
112     -#include <net/if.h>
113     +#include <sys/socket.h>
114     +#include <linux/if.h>
115    
116     #include <WiMaxAPI.h>
117     #include <WiMaxAPIEx.h>

  ViewVC Help
Powered by ViewVC 1.1.20