]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blame - src/patches/iproute2-includes.patch
projects / people / teissler / ipfire-2.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Wir kehren zurueck zu Kudzu, da hwinfo noch mehr Aerger macht.
[people/teissler/ipfire-2.x.git] / src / patches / iproute2-includes.patch
CommitLineData
cd1a2927
MT		 1diff -ruN iproute2.old/Makefile iproute2/Makefile
2--- iproute2.old/Makefile Thu Aug 2 08:37:03 2001
3+++ iproute2/Makefile Mon Dec 1 22:31:11 2003
4@@ -18,14 +18,14 @@
5 #options for ipx
6 ADDLIB+=ipx_ntop.o ipx_pton.o
7
8-ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
9- ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
10- GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
11- endif
12-endif
13-ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
14- GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
15-endif
16+#ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
17+# ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
18+# GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
19+# endif
20+#endif
21+#ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
22+# GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
23+#endif
24
25 CC = gcc
26 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -Werror -g
27diff -ruN iproute2.old/include/utils.h iproute2/include/utils.h
28--- iproute2.old/include/utils.h Sun Apr 16 19:42:50 2000
29+++ iproute2/include/utils.h Mon Dec 1 22:31:11 2003
30@@ -3,8 +3,9 @@
31
32 #include <asm/types.h>
33 #include <asm/bitops.h>
34+#include <netinet/in.h>
35 #include <linux/inetdevice.h>
36-#include <resolv.h>
37+#include <stdio.h>
38
39 #include "libnetlink.h"
40 #include "ll_map.h"
41diff -ruN iproute2.old/ip/ipaddress.c iproute2/ip/ipaddress.c
42--- iproute2.old/ip/ipaddress.c Thu Aug 23 06:07:46 2001
43+++ iproute2/ip/ipaddress.c Mon Dec 1 22:31:20 2003
44@@ -23,8 +23,6 @@
45 #include <linux/netdevice.h>
46 #include <linux/if_arp.h>
47 #include <linux/sockios.h>
48-#include <netinet/in.h>
49-#include <arpa/inet.h>
50 #include <string.h>
51 #include <fnmatch.h>
52
53diff -ruN iproute2.old/ip/ipmaddr.c iproute2/ip/ipmaddr.c
54--- iproute2.old/ip/ipmaddr.c Sun Apr 16 19:42:51 2000
55+++ iproute2/ip/ipmaddr.c Mon Dec 1 22:31:11 2003
56@@ -21,12 +21,10 @@
57 #include <linux/if.h>
58 #include <linux/if_arp.h>
59 #include <linux/sockios.h>
60-#include <netinet/in.h>
61-#include <arpa/inet.h>
62 #include <string.h>
63
64-#include "rt_names.h"
65 #include "utils.h"
66+#include "rt_names.h"
67
68 static struct {
69 char *dev;
70diff -ruN iproute2.old/ip/ipmroute.c iproute2/ip/ipmroute.c
71--- iproute2.old/ip/ipmroute.c Fri Aug 24 19:19:20 2001
72+++ iproute2/ip/ipmroute.c Mon Dec 1 22:31:11 2003
73@@ -21,8 +21,6 @@
74 #include <linux/if.h>
75 #include <linux/if_arp.h>
76 #include <linux/sockios.h>
77-#include <netinet/in.h>
78-#include <arpa/inet.h>
79 #include <string.h>
80
81 #include "utils.h"
82diff -ruN iproute2.old/ip/ipneigh.c iproute2/ip/ipneigh.c
83--- iproute2.old/ip/ipneigh.c Sun Apr 16 19:42:51 2000
84+++ iproute2/ip/ipneigh.c Mon Dec 1 22:31:11 2003
85@@ -26,8 +26,8 @@
86 #include <netinet/in.h>
87 #include <netinet/ip.h>
88
89-#include "rt_names.h"
90 #include "utils.h"
91+#include "rt_names.h"
92 #include "ip_common.h"
93
94 #define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)
95diff -ruN iproute2.old/ip/iproute.c iproute2/ip/iproute.c
96--- iproute2.old/ip/iproute.c Mon Aug 6 02:31:52 2001
97+++ iproute2/ip/iproute.c Mon Dec 1 22:31:11 2003
98@@ -28,8 +28,8 @@
99 #include <arpa/inet.h>
100 #include <linux/in_route.h>
101
102-#include "rt_names.h"
103 #include "utils.h"
104+#include "rt_names.h"
105 #include "ip_common.h"
106
107 #ifndef RTAX_RTTVAR
108diff -ruN iproute2.old/ip/iprule.c iproute2/ip/iprule.c
109--- iproute2.old/ip/iprule.c Thu Aug 2 05:43:29 2001
110+++ iproute2/ip/iprule.c Mon Dec 1 22:31:11 2003
111@@ -25,8 +25,8 @@
112 #include <arpa/inet.h>
113 #include <string.h>
114
115-#include "rt_names.h"
116 #include "utils.h"
117+#include "rt_names.h"
118
119 static void usage(void) __attribute__((noreturn));
120
121diff -ruN iproute2.old/ip/rtacct.c iproute2/ip/rtacct.c
122--- iproute2.old/ip/rtacct.c Sun Apr 16 19:42:51 2000
123+++ iproute2/ip/rtacct.c Mon Dec 1 22:31:11 2003
124@@ -19,7 +19,9 @@
125 #include <sys/time.h>
126 #include <net/if.h>
127 #include <string.h>
128+#include <netinet/in.h>
129
130+#include "utils.h"
131 #include "rt_names.h"
132
133 int main(int argc, char **argv)
134diff -ruN iproute2.old/ip/rtm_map.c iproute2/ip/rtm_map.c
135--- iproute2.old/ip/rtm_map.c Sun Apr 16 19:42:51 2000
136+++ iproute2/ip/rtm_map.c Mon Dec 1 22:31:11 2003
137@@ -19,8 +19,8 @@
138 #include <sys/socket.h>
139 #include <netinet/in.h>
140
141-#include "rt_names.h"
142 #include "utils.h"
143+#include "rt_names.h"
144
145 char *rtnl_rtntype_n2a(int id, char *buf, int len)
146 {
147diff -ruN iproute2.old/lib/dnet_ntop.c iproute2/lib/dnet_ntop.c
148--- iproute2.old/lib/dnet_ntop.c Sun Apr 16 19:42:52 2000
149+++ iproute2/lib/dnet_ntop.c Mon Dec 1 22:31:11 2003
150@@ -1,5 +1,6 @@
151 #include <errno.h>
152 #include <sys/types.h>
153+#include <stdio.h>
154 #include <netinet/in.h>
155
156 #include "utils.h"
157diff -ruN iproute2.old/lib/ll_proto.c iproute2/lib/ll_proto.c
158--- iproute2.old/lib/ll_proto.c Thu Aug 2 04:41:41 2001
159+++ iproute2/lib/ll_proto.c Mon Dec 1 22:31:11 2003
160@@ -20,8 +20,6 @@
161 #include <linux/netdevice.h>
162 #include <linux/if_arp.h>
163 #include <linux/sockios.h>
164-#include <netinet/in.h>
165-#include <arpa/inet.h>
166 #include <string.h>
167
168 #include "utils.h"
169diff -ruN iproute2.old/lib/ll_types.c iproute2/lib/ll_types.c
170--- iproute2.old/lib/ll_types.c Thu Aug 2 05:18:33 2001
171+++ iproute2/lib/ll_types.c Mon Dec 1 22:31:11 2003
172@@ -9,6 +9,7 @@
173 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
174 */
175
176+#include <stdint.h>
177 #include <stdio.h>
178 #include <stdlib.h>
179 #include <unistd.h>
180@@ -16,12 +17,9 @@
181 #include <fcntl.h>
182 #include <sys/ioctl.h>
183 #include <sys/socket.h>
184-#include <sys/ioctl.h>
185 #include <linux/netdevice.h>
186 #include <linux/if_arp.h>
187 #include <linux/sockios.h>
188-#include <netinet/in.h>
189-#include <arpa/inet.h>
190 #include <string.h>
191
192 char * ll_type_n2a(int type, char *buf, int len)
193diff -ruN iproute2.old/lib/rt_names.c iproute2/lib/rt_names.c
194--- iproute2.old/lib/rt_names.c Sun Apr 16 19:42:52 2000
195+++ iproute2/lib/rt_names.c Mon Dec 1 22:31:11 2003
196@@ -16,6 +16,7 @@
197 #include <fcntl.h>
198 #include <string.h>
199 #include <sys/time.h>
200+#include <asm/types.h>
201
202 static void rtnl_tab_initialize(char *file, char **tab, int size)
203 {
204diff -ruN iproute2.old/lib/utils.c iproute2/lib/utils.c
205--- iproute2.old/lib/utils.c Fri Aug 24 19:09:54 2001
206+++ iproute2/lib/utils.c Mon Dec 1 22:31:11 2003
207@@ -25,7 +25,6 @@
208 #include <netdb.h>
209 #include <arpa/inet.h>
210 #include <resolv.h>
211-#include <linux/pkt_sched.h>
212
213 #include "utils.h"
214
215diff -ruN iproute2.old/tc/f_rsvp.c iproute2/tc/f_rsvp.c
216--- iproute2.old/tc/f_rsvp.c Thu Aug 2 06:19:40 2001
217+++ iproute2/tc/f_rsvp.c Mon Dec 1 22:31:11 2003
218@@ -20,8 +20,8 @@
219 #include <arpa/inet.h>
220 #include <string.h>
221
222-#include "rt_names.h"
223 #include "utils.h"
224+#include "rt_names.h"
225 #include "tc_util.h"
226
227 static void explain(void)
228diff -ruN iproute2.old/tc/q_htb.c iproute2/tc/q_htb.c
229--- iproute2.old/tc/q_htb.c Mon Dec 1 22:30:53 2003
230+++ iproute2/tc/q_htb.c Mon Dec 1 22:31:11 2003
231@@ -19,6 +19,7 @@
232 #include <netinet/in.h>
233 #include <arpa/inet.h>
234 #include <string.h>
235+#include <linux/param.h>
236
237 #include "utils.h"
238 #include "tc_util.h"
239diff -ruN iproute2.old/tc/tc_filter.c iproute2/tc/tc_filter.c
240--- iproute2.old/tc/tc_filter.c Fri Aug 24 19:19:19 2001
241+++ iproute2/tc/tc_filter.c Mon Dec 1 22:31:11 2003
242@@ -23,8 +23,8 @@
243 #include <string.h>
244 #include <linux/if_ether.h>
245
246-#include "rt_names.h"
247 #include "utils.h"
248+#include "rt_names.h"
249 #include "tc_util.h"
250 #include "tc_common.h"
251
Timo's tree of IPFire 2.x