]>
Commit | Line | Data |
---|---|---|
5e993f12 | 1 | Pull in the linux/types.h header where needed (and sneak in some other |
2 | minor header additions as well). | |
3 | ||
4 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | |
5 | ||
6 | diff --git a/linux-2.6/include/linux/atm.h b/linux-2.6/include/linux/atm.h | |
7 | index 6013668..5e12916 100644 | |
8 | --- a/linux-2.6/include/linux/atm.h | |
9 | +++ b/linux-2.6/include/linux/atm.h | |
10 | @@ -16,10 +16,8 @@ | |
11 | * documentation. Do not change them. | |
12 | */ | |
13 | ||
14 | -#ifdef __KERNEL__ | |
15 | #include <linux/socket.h> | |
16 | #include <linux/types.h> | |
17 | -#endif | |
18 | #include <linux/compiler.h> | |
19 | #include <linux/atmapi.h> | |
20 | #include <linux/atmsap.h> | |
21 | diff --git a/linux-2.6/include/linux/atm_tcp.h b/linux-2.6/include/linux/atm_tcp.h | |
22 | index 18787f9..e1eba63 100644 | |
23 | --- a/linux-2.6/include/linux/atm_tcp.h | |
24 | +++ b/linux-2.6/include/linux/atm_tcp.h | |
25 | @@ -8,10 +8,8 @@ | |
26 | #define LINUX_ATM_TCP_H | |
27 | ||
28 | #include <linux/atmapi.h> | |
29 | - | |
30 | -#ifdef __KERNEL__ | |
31 | #include <linux/types.h> | |
32 | -#endif | |
33 | +#include <linux/atm.h> | |
34 | #include <linux/atmioc.h> | |
35 | ||
36 | ||
37 | diff --git a/linux-2.6/include/linux/atmarp.h b/linux-2.6/include/linux/atmarp.h | |
38 | index ee108f9..231f4bd 100644 | |
39 | --- a/linux-2.6/include/linux/atmarp.h | |
40 | +++ b/linux-2.6/include/linux/atmarp.h | |
41 | @@ -6,9 +6,7 @@ | |
42 | #ifndef _LINUX_ATMARP_H | |
43 | #define _LINUX_ATMARP_H | |
44 | ||
45 | -#ifdef __KERNEL__ | |
46 | #include <linux/types.h> | |
47 | -#endif | |
48 | #include <linux/atmapi.h> | |
49 | #include <linux/atmioc.h> | |
50 | ||
51 | diff --git a/linux-2.6/include/linux/audit.h b/linux-2.6/include/linux/audit.h | |
52 | index 0e07db6..97da74b 100644 | |
53 | --- a/linux-2.6/include/linux/audit.h | |
54 | +++ b/linux-2.6/include/linux/audit.h | |
55 | @@ -25,6 +25,7 @@ | |
56 | #define _LINUX_AUDIT_H_ | |
57 | ||
58 | #include <linux/elf-em.h> | |
59 | +#include <linux/types.h> | |
60 | ||
61 | /* The netlink messages for the audit system is divided into blocks: | |
62 | * 1000 - 1099 are for commanding the audit system | |
63 | diff --git a/linux-2.6/include/linux/auto_fs.h b/linux-2.6/include/linux/auto_fs.h | |
64 | index c21e597..9a5c539 100644 | |
65 | --- a/linux-2.6/include/linux/auto_fs.h | |
66 | +++ b/linux-2.6/include/linux/auto_fs.h | |
67 | @@ -16,10 +16,10 @@ | |
68 | ||
69 | #ifdef __KERNEL__ | |
70 | #include <linux/fs.h> | |
71 | -#include <linux/limits.h> | |
72 | #include <asm/types.h> | |
73 | #endif /* __KERNEL__ */ | |
74 | ||
75 | +#include <linux/limits.h> | |
76 | #include <linux/ioctl.h> | |
77 | ||
78 | /* This file describes autofs v3 */ | |
79 | diff --git a/linux-2.6/include/linux/auto_fs4.h b/linux-2.6/include/linux/auto_fs4.h | |
80 | index 0a6bc52..ce9c79c 100644 | |
81 | --- a/linux-2.6/include/linux/auto_fs4.h | |
82 | +++ b/linux-2.6/include/linux/auto_fs4.h | |
83 | @@ -11,6 +11,8 @@ | |
84 | #ifndef _LINUX_AUTO_FS4_H | |
85 | #define _LINUX_AUTO_FS4_H | |
86 | ||
87 | +#include <linux/types.h> | |
88 | + | |
89 | /* Include common v3 definitions */ | |
90 | #include <linux/auto_fs.h> | |
91 | ||
92 | diff --git a/linux-2.6/include/linux/bfs_fs.h b/linux-2.6/include/linux/bfs_fs.h | |
93 | index 8ed6dfd..2ca3e8f 100644 | |
94 | --- a/linux-2.6/include/linux/bfs_fs.h | |
95 | +++ b/linux-2.6/include/linux/bfs_fs.h | |
96 | @@ -6,6 +6,8 @@ | |
97 | #ifndef _LINUX_BFS_FS_H | |
98 | #define _LINUX_BFS_FS_H | |
99 | ||
100 | +#include <linux/types.h> | |
101 | + | |
102 | #define BFS_BSIZE_BITS 9 | |
103 | #define BFS_BSIZE (1<<BFS_BSIZE_BITS) | |
104 | ||
105 | diff --git a/linux-2.6/include/linux/byteorder/swab.h b/linux-2.6/include/linux/byteorder/swab.h | |
106 | index 25f7f32..8fa33f2 100644 | |
107 | --- a/linux-2.6/include/linux/byteorder/swab.h | |
108 | +++ b/linux-2.6/include/linux/byteorder/swab.h | |
109 | @@ -15,6 +15,7 @@ | |
110 | * | |
111 | */ | |
112 | ||
113 | +#include <linux/types.h> | |
114 | #include <linux/compiler.h> | |
115 | ||
116 | /* casts are necessary for constants, because we never know how for sure | |
117 | diff --git a/linux-2.6/include/linux/byteorder/swabb.h b/linux-2.6/include/linux/byteorder/swabb.h | |
118 | index ae5e5f9..b582ff5 100644 | |
119 | --- a/linux-2.6/include/linux/byteorder/swabb.h | |
120 | +++ b/linux-2.6/include/linux/byteorder/swabb.h | |
121 | @@ -13,6 +13,8 @@ | |
122 | * | |
123 | */ | |
124 | ||
125 | +#include <linux/types.h> | |
126 | + | |
127 | /* | |
128 | * Meaning of the names I chose (vaxlinux people feel free to correct them): | |
129 | * swahw32 swap 16-bit half-words in a 32-bit word | |
130 | diff --git a/linux-2.6/include/linux/cm4000_cs.h b/linux-2.6/include/linux/cm4000_cs.h | |
131 | index 605ebe2..8d95b2f 100644 | |
132 | --- a/linux-2.6/include/linux/cm4000_cs.h | |
133 | +++ b/linux-2.6/include/linux/cm4000_cs.h | |
134 | @@ -1,6 +1,9 @@ | |
135 | #ifndef _CM4000_H_ | |
136 | #define _CM4000_H_ | |
137 | ||
138 | +#include <linux/types.h> | |
139 | +#include <linux/ioctl.h> | |
140 | + | |
141 | #define MAX_ATR 33 | |
142 | ||
143 | #define CM4000_MAX_DEV 4 | |
144 | diff --git a/linux-2.6/include/linux/dirent.h b/linux-2.6/include/linux/dirent.h | |
145 | index 5d6023b..d5b642d 100644 | |
146 | --- a/linux-2.6/include/linux/dirent.h | |
147 | +++ b/linux-2.6/include/linux/dirent.h | |
148 | @@ -1,6 +1,8 @@ | |
149 | #ifndef _LINUX_DIRENT_H | |
150 | #define _LINUX_DIRENT_H | |
151 | ||
152 | +#include <linux/types.h> | |
153 | + | |
154 | struct dirent { | |
155 | long d_ino; | |
156 | __kernel_off_t d_off; | |
157 | diff --git a/linux-2.6/include/linux/dlm.h b/linux-2.6/include/linux/dlm.h | |
158 | index 1b1dcb9..415c400 100644 | |
159 | --- a/linux-2.6/include/linux/dlm.h | |
160 | +++ b/linux-2.6/include/linux/dlm.h | |
161 | @@ -19,6 +19,8 @@ | |
162 | * routines and structures to use DLM lockspaces | |
163 | */ | |
164 | ||
165 | +#include <linux/types.h> | |
166 | + | |
167 | /* | |
168 | * Lock Modes | |
169 | */ | |
170 | diff --git a/linux-2.6/include/linux/dlm_device.h b/linux-2.6/include/linux/dlm_device.h | |
171 | index 2a2dd18..52544a0 100644 | |
172 | --- a/linux-2.6/include/linux/dlm_device.h | |
173 | +++ b/linux-2.6/include/linux/dlm_device.h | |
174 | @@ -11,10 +11,16 @@ | |
175 | ******************************************************************************* | |
176 | ******************************************************************************/ | |
177 | ||
178 | +#ifndef _LINUX_DLM_DEVICE_H | |
179 | +#define _LINUX_DLM_DEVICE_H | |
180 | + | |
181 | /* This is the device interface for dlm, most users will use a library | |
182 | * interface. | |
183 | */ | |
184 | ||
185 | +#include <linux/dlm.h> | |
186 | +#include <linux/types.h> | |
187 | + | |
188 | #define DLM_USER_LVB_LEN 32 | |
189 | ||
190 | /* Version of the device interface */ | |
191 | @@ -84,3 +90,4 @@ struct dlm_lock_result { | |
192 | #define DLM_USER_LSFLG_AUTOFREE 1 | |
193 | #define DLM_USER_LSFLG_FORCEFREE 2 | |
194 | ||
195 | +#endif | |
196 | diff --git a/linux-2.6/include/linux/dn.h b/linux-2.6/include/linux/dn.h | |
197 | index 10b6a6f..9a13dd6 100644 | |
198 | --- a/linux-2.6/include/linux/dn.h | |
199 | +++ b/linux-2.6/include/linux/dn.h | |
200 | @@ -7,6 +7,9 @@ | |
201 | ||
202 | */ | |
203 | ||
204 | +#include <linux/ioctl.h> | |
205 | +#include <linux/types.h> | |
206 | + | |
207 | /* | |
208 | * DNPROTO_NSP can't be the same as SOL_SOCKET, | |
209 | * so increment each by one (compared to ULTRIX) | |
210 | diff --git a/linux-2.6/include/linux/efs_fs_sb.h b/linux-2.6/include/linux/efs_fs_sb.h | |
211 | index ff1945e..a742b29 100644 | |
212 | --- a/linux-2.6/include/linux/efs_fs_sb.h | |
213 | +++ b/linux-2.6/include/linux/efs_fs_sb.h | |
214 | @@ -10,6 +10,7 @@ | |
215 | #define __EFS_FS_SB_H__ | |
216 | ||
217 | #include <linux/magic.h> | |
218 | +#include <linux/types.h> | |
219 | ||
220 | /* EFS superblock magic numbers */ | |
221 | #define EFS_MAGIC 0x072959 | |
222 | diff --git a/linux-2.6/include/linux/errqueue.h b/linux-2.6/include/linux/errqueue.h | |
223 | index 92f8d4f..ceb1454 100644 | |
224 | --- a/linux-2.6/include/linux/errqueue.h | |
225 | +++ b/linux-2.6/include/linux/errqueue.h | |
226 | @@ -1,6 +1,8 @@ | |
227 | #ifndef _LINUX_ERRQUEUE_H | |
228 | #define _LINUX_ERRQUEUE_H 1 | |
229 | ||
230 | +#include <linux/types.h> | |
231 | + | |
232 | struct sock_extended_err | |
233 | { | |
234 | __u32 ee_errno; | |
235 | diff --git a/linux-2.6/include/linux/ethtool.h b/linux-2.6/include/linux/ethtool.h | |
236 | index c6310ae..f6fd474 100644 | |
237 | --- a/linux-2.6/include/linux/ethtool.h | |
238 | +++ b/linux-2.6/include/linux/ethtool.h | |
239 | @@ -12,6 +12,7 @@ | |
240 | #ifndef _LINUX_ETHTOOL_H | |
241 | #define _LINUX_ETHTOOL_H | |
242 | ||
243 | +#include <linux/types.h> | |
244 | ||
245 | /* This should work for both 32 and 64 bit userland. */ | |
246 | struct ethtool_cmd { | |
247 | diff --git a/linux-2.6/include/linux/gfs2_ondisk.h b/linux-2.6/include/linux/gfs2_ondisk.h | |
248 | index 8b7e4c1..e707cb5 100644 | |
249 | --- a/linux-2.6/include/linux/gfs2_ondisk.h | |
250 | +++ b/linux-2.6/include/linux/gfs2_ondisk.h | |
251 | @@ -10,6 +10,8 @@ | |
252 | #ifndef __GFS2_ONDISK_DOT_H__ | |
253 | #define __GFS2_ONDISK_DOT_H__ | |
254 | ||
255 | +#include <linux/types.h> | |
256 | + | |
257 | #define GFS2_MAGIC 0x01161970 | |
258 | #define GFS2_BASIC_BLOCK 512 | |
259 | #define GFS2_BASIC_BLOCK_SHIFT 9 | |
260 | diff --git a/linux-2.6/include/linux/hiddev.h b/linux-2.6/include/linux/hiddev.h | |
261 | index acbdae6..3b35f72 100644 | |
262 | --- a/linux-2.6/include/linux/hiddev.h | |
263 | +++ b/linux-2.6/include/linux/hiddev.h | |
264 | @@ -29,6 +29,8 @@ | |
265 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic | |
266 | */ | |
267 | ||
268 | +#include <linux/types.h> | |
269 | + | |
270 | /* | |
271 | * The event structure itself | |
272 | */ | |
273 | diff --git a/linux-2.6/include/linux/i2o-dev.h b/linux-2.6/include/linux/i2o-dev.h | |
274 | index c2519df..1697662 100644 | |
275 | --- a/linux-2.6/include/linux/i2o-dev.h | |
276 | +++ b/linux-2.6/include/linux/i2o-dev.h | |
277 | @@ -24,6 +24,7 @@ | |
278 | #define MAX_I2O_CONTROLLERS 32 | |
279 | ||
280 | #include <linux/ioctl.h> | |
281 | +#include <linux/types.h> | |
282 | ||
283 | /* | |
284 | * I2O Control IOCTLs and structures | |
285 | diff --git a/linux-2.6/include/linux/if_fc.h b/linux-2.6/include/linux/if_fc.h | |
286 | index 376a34e..6ed7f1b 100644 | |
287 | --- a/linux-2.6/include/linux/if_fc.h | |
288 | +++ b/linux-2.6/include/linux/if_fc.h | |
289 | @@ -20,6 +20,7 @@ | |
290 | #ifndef _LINUX_IF_FC_H | |
291 | #define _LINUX_IF_FC_H | |
292 | ||
293 | +#include <linux/types.h> | |
294 | ||
295 | #define FC_ALEN 6 /* Octets in one ethernet addr */ | |
296 | #define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) | |
297 | diff --git a/linux-2.6/include/linux/if_fddi.h b/linux-2.6/include/linux/if_fddi.h | |
298 | index e0a1500..58ada1f 100644 | |
299 | --- a/linux-2.6/include/linux/if_fddi.h | |
300 | +++ b/linux-2.6/include/linux/if_fddi.h | |
301 | @@ -24,6 +24,8 @@ | |
302 | #ifndef _LINUX_IF_FDDI_H | |
303 | #define _LINUX_IF_FDDI_H | |
304 | ||
305 | +#include <linux/types.h> | |
306 | + | |
307 | /* | |
308 | * Define max and min legal sizes. The frame sizes do not include | |
309 | * 4 byte FCS/CRC (frame check sequence). | |
310 | diff --git a/linux-2.6/include/linux/if_ppp.h b/linux-2.6/include/linux/if_ppp.h | |
311 | index 768372f..ad859a2 100644 | |
312 | --- a/linux-2.6/include/linux/if_ppp.h | |
313 | +++ b/linux-2.6/include/linux/if_ppp.h | |
314 | @@ -36,6 +36,8 @@ | |
315 | #define _IF_PPP_H_ | |
316 | ||
317 | #include <linux/compiler.h> | |
318 | +#include <linux/ppp_defs.h> | |
319 | +#include <linux/types.h> | |
320 | ||
321 | /* | |
322 | * Packet sizes | |
323 | diff --git a/linux-2.6/include/linux/if_shaper.h b/linux-2.6/include/linux/if_shaper.h | |
324 | index 68c896a..6d5038e 100644 | |
325 | --- a/linux-2.6/include/linux/if_shaper.h | |
326 | +++ b/linux-2.6/include/linux/if_shaper.h | |
327 | @@ -1,6 +1,8 @@ | |
328 | #ifndef __LINUX_SHAPER_H | |
329 | #define __LINUX_SHAPER_H | |
330 | ||
331 | +#include <linux/types.h> | |
332 | + | |
333 | #ifdef __KERNEL__ | |
334 | ||
335 | #define SHAPER_QLEN 10 | |
336 | diff --git a/linux-2.6/include/linux/if_strip.h b/linux-2.6/include/linux/if_strip.h | |
337 | index fb5c5c9..6526a62 100644 | |
338 | --- a/linux-2.6/include/linux/if_strip.h | |
339 | +++ b/linux-2.6/include/linux/if_strip.h | |
340 | @@ -18,6 +18,8 @@ | |
341 | #ifndef __LINUX_STRIP_H | |
342 | #define __LINUX_STRIP_H | |
343 | ||
344 | +#include <linux/types.h> | |
345 | + | |
346 | typedef struct { | |
347 | __u8 c[6]; | |
348 | } MetricomAddress; | |
349 | diff --git a/linux-2.6/include/linux/inet_diag.h b/linux-2.6/include/linux/inet_diag.h | |
350 | index 6e8bc54..bc8c490 100644 | |
351 | --- a/linux-2.6/include/linux/inet_diag.h | |
352 | +++ b/linux-2.6/include/linux/inet_diag.h | |
353 | @@ -1,6 +1,8 @@ | |
354 | #ifndef _INET_DIAG_H_ | |
355 | #define _INET_DIAG_H_ 1 | |
356 | ||
357 | +#include <linux/types.h> | |
358 | + | |
359 | /* Just some random number */ | |
360 | #define TCPDIAG_GETSOCK 18 | |
361 | #define DCCPDIAG_GETSOCK 19 | |
362 | diff --git a/linux-2.6/include/linux/ipx.h b/linux-2.6/include/linux/ipx.h | |
363 | index eb19b4e..22d379f 100644 | |
364 | --- a/linux-2.6/include/linux/ipx.h | |
365 | +++ b/linux-2.6/include/linux/ipx.h | |
366 | @@ -2,6 +2,7 @@ | |
367 | #define _IPX_H_ | |
368 | #include <linux/sockios.h> | |
369 | #include <linux/socket.h> | |
370 | +#include <linux/types.h> | |
371 | #define IPX_NODE_LEN 6 | |
372 | #define IPX_MTU 576 | |
373 | ||
374 | diff --git a/linux-2.6/include/linux/irda.h b/linux-2.6/include/linux/irda.h | |
375 | index 09d8f10..b41984f 100644 | |
376 | --- a/linux-2.6/include/linux/irda.h | |
377 | +++ b/linux-2.6/include/linux/irda.h | |
378 | @@ -31,6 +31,9 @@ | |
379 | * this one, or preferably to include <net/irda/irda.h> instead. | |
380 | * Jean II */ | |
381 | ||
382 | +#include <linux/types.h> | |
383 | +#include <linux/socket.h> | |
384 | + | |
385 | /* Hint bit positions for first hint byte */ | |
386 | #define HINT_PNP 0x01 | |
387 | #define HINT_PDA 0x02 | |
388 | diff --git a/linux-2.6/include/linux/lock_dlm_plock.h b/linux-2.6/include/linux/lock_dlm_plock.h | |
389 | index fc34151..d3c2a54 100644 | |
390 | --- a/linux-2.6/include/linux/lock_dlm_plock.h | |
391 | +++ b/linux-2.6/include/linux/lock_dlm_plock.h | |
392 | @@ -9,6 +9,8 @@ | |
393 | #ifndef __LOCK_DLM_PLOCK_DOT_H__ | |
394 | #define __LOCK_DLM_PLOCK_DOT_H__ | |
395 | ||
396 | +#include <linux/types.h> | |
397 | + | |
398 | #define GDLM_PLOCK_MISC_NAME "lock_dlm_plock" | |
399 | ||
400 | #define GDLM_PLOCK_VERSION_MAJOR 1 | |
401 | diff --git a/linux-2.6/include/linux/minix_fs.h b/linux-2.6/include/linux/minix_fs.h | |
402 | index 916e8f7..bb33d11 100644 | |
403 | --- a/linux-2.6/include/linux/minix_fs.h | |
404 | +++ b/linux-2.6/include/linux/minix_fs.h | |
405 | @@ -2,6 +2,7 @@ | |
406 | #define _LINUX_MINIX_FS_H | |
407 | ||
408 | #include <linux/magic.h> | |
409 | +#include <linux/types.h> | |
410 | ||
411 | /* | |
412 | * The minix filesystem constants/structures | |
413 | diff --git a/linux-2.6/include/linux/netfilter/x_tables.h b/linux-2.6/include/linux/netfilter/x_tables.h | |
414 | index 022edfa..175741c 100644 | |
415 | --- a/linux-2.6/include/linux/netfilter/x_tables.h | |
416 | +++ b/linux-2.6/include/linux/netfilter/x_tables.h | |
417 | @@ -1,6 +1,8 @@ | |
418 | #ifndef _X_TABLES_H | |
419 | #define _X_TABLES_H | |
420 | ||
421 | +#include <linux/types.h> | |
422 | + | |
423 | #define XT_FUNCTION_MAXNAMELEN 30 | |
424 | #define XT_TABLE_MAXNAMELEN 32 | |
425 | ||
426 | diff --git a/linux-2.6/include/linux/netrom.h b/linux-2.6/include/linux/netrom.h | |
427 | index 6939b32..af7313c 100644 | |
428 | --- a/linux-2.6/include/linux/netrom.h | |
429 | +++ b/linux-2.6/include/linux/netrom.h | |
430 | @@ -7,6 +7,8 @@ | |
431 | #ifndef NETROM_KERNEL_H | |
432 | #define NETROM_KERNEL_H | |
433 | ||
434 | +#include <linux/ax25.h> | |
435 | + | |
436 | #define NETROM_MTU 236 | |
437 | ||
438 | #define NETROM_T1 1 | |
439 | diff --git a/linux-2.6/include/linux/nfs_idmap.h b/linux-2.6/include/linux/nfs_idmap.h | |
440 | index 15a9f3b..91a1c24 100644 | |
441 | --- a/linux-2.6/include/linux/nfs_idmap.h | |
442 | +++ b/linux-2.6/include/linux/nfs_idmap.h | |
443 | @@ -37,6 +37,8 @@ | |
444 | #ifndef NFS_IDMAP_H | |
445 | #define NFS_IDMAP_H | |
446 | ||
447 | +#include <linux/types.h> | |
448 | + | |
449 | /* XXX from bits/utmp.h */ | |
450 | #define IDMAP_NAMESZ 128 | |
451 | ||
452 | diff --git a/linux-2.6/include/linux/nubus.h b/linux-2.6/include/linux/nubus.h | |
453 | index 870e66a..72c8774 100644 | |
454 | --- a/linux-2.6/include/linux/nubus.h | |
455 | +++ b/linux-2.6/include/linux/nubus.h | |
456 | @@ -12,6 +12,8 @@ | |
457 | #ifndef LINUX_NUBUS_H | |
458 | #define LINUX_NUBUS_H | |
459 | ||
460 | +#include <linux/types.h> | |
461 | + | |
462 | #ifdef __KERNEL__ | |
463 | #include <asm/nubus.h> | |
464 | #endif | |
465 | diff --git a/linux-2.6/include/linux/pkt_cls.h b/linux-2.6/include/linux/pkt_cls.h | |
466 | index c3f01b3..762f048 100644 | |
467 | --- a/linux-2.6/include/linux/pkt_cls.h | |
468 | +++ b/linux-2.6/include/linux/pkt_cls.h | |
469 | @@ -2,6 +2,7 @@ | |
470 | #define __LINUX_PKT_CLS_H | |
471 | ||
472 | #include <linux/pkt_sched.h> | |
473 | +#include <linux/types.h> | |
474 | ||
475 | /* I think i could have done better macros ; for now this is stolen from | |
476 | * some arch/mips code - jhs | |
477 | diff --git a/linux-2.6/include/linux/pkt_sched.h b/linux-2.6/include/linux/pkt_sched.h | |
478 | index d10f353..2169d79 100644 | |
479 | --- a/linux-2.6/include/linux/pkt_sched.h | |
480 | +++ b/linux-2.6/include/linux/pkt_sched.h | |
481 | @@ -1,6 +1,8 @@ | |
482 | #ifndef __LINUX_PKT_SCHED_H | |
483 | #define __LINUX_PKT_SCHED_H | |
484 | ||
485 | +#include <linux/types.h> | |
486 | + | |
487 | /* Logical priority bands not depending on specific packet scheduler. | |
488 | Every scheduler will map them to real traffic classes, if it has | |
489 | no more precise mechanism to classify packets. | |
490 | diff --git a/linux-2.6/include/linux/ppp_defs.h b/linux-2.6/include/linux/ppp_defs.h | |
491 | index c6b13ff..a71510a 100644 | |
492 | --- a/linux-2.6/include/linux/ppp_defs.h | |
493 | +++ b/linux-2.6/include/linux/ppp_defs.h | |
494 | @@ -42,6 +42,8 @@ | |
495 | #ifndef _PPP_DEFS_H_ | |
496 | #define _PPP_DEFS_H_ | |
497 | ||
498 | +#include <linux/types.h> | |
499 | + | |
500 | /* | |
501 | * The basic PPP frame. | |
502 | */ | |
503 | diff --git a/linux-2.6/include/linux/random.h b/linux-2.6/include/linux/random.h | |
504 | index 01ad710..57195d0 100644 | |
505 | --- a/linux-2.6/include/linux/random.h | |
506 | +++ b/linux-2.6/include/linux/random.h | |
507 | @@ -8,6 +8,7 @@ | |
508 | #define _LINUX_RANDOM_H | |
509 | ||
510 | #include <linux/ioctl.h> | |
511 | +#include <linux/types.h> | |
512 | ||
513 | /* ioctl()'s for the random number generator */ | |
514 | ||
515 | diff --git a/linux-2.6/include/linux/romfs_fs.h b/linux-2.6/include/linux/romfs_fs.h | |
516 | index e20bbf9..1404f8d 100644 | |
517 | --- a/linux-2.6/include/linux/romfs_fs.h | |
518 | +++ b/linux-2.6/include/linux/romfs_fs.h | |
519 | @@ -1,6 +1,8 @@ | |
520 | #ifndef __LINUX_ROMFS_FS_H | |
521 | #define __LINUX_ROMFS_FS_H | |
522 | ||
523 | +#include <linux/types.h> | |
524 | + | |
525 | /* The basic structures of the romfs filesystem */ | |
526 | ||
527 | #define ROMBSIZE BLOCK_SIZE | |
528 | diff --git a/linux-2.6/include/linux/selinux_netlink.h b/linux-2.6/include/linux/selinux_netlink.h | |
529 | index bbf489d..faf9675 100644 | |
530 | --- a/linux-2.6/include/linux/selinux_netlink.h | |
531 | +++ b/linux-2.6/include/linux/selinux_netlink.h | |
532 | @@ -12,6 +12,8 @@ | |
533 | #ifndef _LINUX_SELINUX_NETLINK_H | |
534 | #define _LINUX_SELINUX_NETLINK_H | |
535 | ||
536 | +#include <linux/types.h> | |
537 | + | |
538 | /* Message types. */ | |
539 | #define SELNL_MSG_BASE 0x10 | |
540 | enum { | |
541 | diff --git a/linux-2.6/include/linux/socket.h b/linux-2.6/include/linux/socket.h | |
542 | index 92cd38e..545c041 100644 | |
543 | diff --git a/linux-2.6/include/linux/synclink.h b/linux-2.6/include/linux/synclink.h | |
544 | index c8b0426..ba59b6d 100644 | |
545 | --- a/linux-2.6/include/linux/synclink.h | |
546 | +++ b/linux-2.6/include/linux/synclink.h | |
547 | @@ -11,6 +11,9 @@ | |
548 | ||
549 | #ifndef _SYNCLINK_H_ | |
550 | #define _SYNCLINK_H_ | |
551 | + | |
552 | +#include <linux/types.h> | |
553 | + | |
554 | #define SYNCLINK_H_VERSION 3.6 | |
555 | ||
556 | #define BOOLEAN int | |
557 | diff --git a/linux-2.6/include/linux/video_decoder.h b/linux-2.6/include/linux/video_decoder.h | |
558 | index 121e26d..e26c0c8 100644 | |
559 | --- a/linux-2.6/include/linux/video_decoder.h | |
560 | +++ b/linux-2.6/include/linux/video_decoder.h | |
561 | @@ -1,6 +1,8 @@ | |
562 | #ifndef _LINUX_VIDEO_DECODER_H | |
563 | #define _LINUX_VIDEO_DECODER_H | |
564 | ||
565 | +#include <linux/types.h> | |
566 | + | |
567 | #define HAVE_VIDEO_DECODER 1 | |
568 | ||
569 | struct video_decoder_capability { /* this name is too long */ | |
570 | diff --git a/linux-2.6/include/linux/video_encoder.h b/linux-2.6/include/linux/video_encoder.h | |
571 | index 4b0e690..b7b6423 100644 | |
572 | --- a/linux-2.6/include/linux/video_encoder.h | |
573 | +++ b/linux-2.6/include/linux/video_encoder.h | |
574 | @@ -1,6 +1,8 @@ | |
575 | #ifndef _LINUX_VIDEO_ENCODER_H | |
576 | #define _LINUX_VIDEO_ENCODER_H | |
577 | ||
578 | +#include <linux/types.h> | |
579 | + | |
580 | struct video_encoder_capability { /* this name is too long */ | |
581 | __u32 flags; | |
582 | #define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ | |
583 | diff --git a/linux-2.6/include/linux/videodev2.h b/linux-2.6/include/linux/videodev2.h | |
584 | diff --git a/linux-2.6/include/linux/wireless.h b/linux-2.6/include/linux/wireless.h | |
585 | index 7c269f4..9ba6355 100644 | |
586 | --- a/linux-2.6/include/linux/wireless.h | |
587 | +++ b/linux-2.6/include/linux/wireless.h | |
588 | @@ -72,11 +72,9 @@ | |
589 | /* This header is used in user-space, therefore need to be sanitised | |
590 | * for that purpose. Those includes are usually not compatible with glibc. | |
591 | * To know which includes to use in user-space, check iwlib.h. */ | |
592 | -#ifdef __KERNEL__ | |
593 | #include <linux/types.h> /* for "caddr_t" et al */ | |
594 | #include <linux/socket.h> /* for "struct sockaddr" et al */ | |
595 | #include <linux/if.h> /* for IFNAMSIZ and co... */ | |
596 | -#endif /* __KERNEL__ */ | |
597 | ||
598 | /***************************** VERSION *****************************/ | |
599 | /* |