Pull in the linux/types.h header where needed (and sneak in some other minor header additions as well). Signed-off-by: Mike Frysinger diff --git a/linux-2.6/include/linux/atm.h b/linux-2.6/include/linux/atm.h index 6013668..5e12916 100644 --- a/linux-2.6/include/linux/atm.h +++ b/linux-2.6/include/linux/atm.h @@ -16,10 +16,8 @@ * documentation. Do not change them. */ -#ifdef __KERNEL__ #include #include -#endif #include #include #include diff --git a/linux-2.6/include/linux/atm_tcp.h b/linux-2.6/include/linux/atm_tcp.h index 18787f9..e1eba63 100644 --- a/linux-2.6/include/linux/atm_tcp.h +++ b/linux-2.6/include/linux/atm_tcp.h @@ -8,10 +8,8 @@ #define LINUX_ATM_TCP_H #include - -#ifdef __KERNEL__ #include -#endif +#include #include diff --git a/linux-2.6/include/linux/atmarp.h b/linux-2.6/include/linux/atmarp.h index ee108f9..231f4bd 100644 --- a/linux-2.6/include/linux/atmarp.h +++ b/linux-2.6/include/linux/atmarp.h @@ -6,9 +6,7 @@ #ifndef _LINUX_ATMARP_H #define _LINUX_ATMARP_H -#ifdef __KERNEL__ #include -#endif #include #include diff --git a/linux-2.6/include/linux/audit.h b/linux-2.6/include/linux/audit.h index 0e07db6..97da74b 100644 --- a/linux-2.6/include/linux/audit.h +++ b/linux-2.6/include/linux/audit.h @@ -25,6 +25,7 @@ #define _LINUX_AUDIT_H_ #include +#include /* The netlink messages for the audit system is divided into blocks: * 1000 - 1099 are for commanding the audit system diff --git a/linux-2.6/include/linux/auto_fs.h b/linux-2.6/include/linux/auto_fs.h index c21e597..9a5c539 100644 --- a/linux-2.6/include/linux/auto_fs.h +++ b/linux-2.6/include/linux/auto_fs.h @@ -16,10 +16,10 @@ #ifdef __KERNEL__ #include -#include #include #endif /* __KERNEL__ */ +#include #include /* This file describes autofs v3 */ diff --git a/linux-2.6/include/linux/auto_fs4.h b/linux-2.6/include/linux/auto_fs4.h index 0a6bc52..ce9c79c 100644 --- a/linux-2.6/include/linux/auto_fs4.h +++ b/linux-2.6/include/linux/auto_fs4.h @@ -11,6 +11,8 @@ #ifndef _LINUX_AUTO_FS4_H #define _LINUX_AUTO_FS4_H +#include + /* Include common v3 definitions */ #include diff --git a/linux-2.6/include/linux/bfs_fs.h b/linux-2.6/include/linux/bfs_fs.h index 8ed6dfd..2ca3e8f 100644 --- a/linux-2.6/include/linux/bfs_fs.h +++ b/linux-2.6/include/linux/bfs_fs.h @@ -6,6 +6,8 @@ #ifndef _LINUX_BFS_FS_H #define _LINUX_BFS_FS_H +#include + #define BFS_BSIZE_BITS 9 #define BFS_BSIZE (1< #include /* casts are necessary for constants, because we never know how for sure diff --git a/linux-2.6/include/linux/byteorder/swabb.h b/linux-2.6/include/linux/byteorder/swabb.h index ae5e5f9..b582ff5 100644 --- a/linux-2.6/include/linux/byteorder/swabb.h +++ b/linux-2.6/include/linux/byteorder/swabb.h @@ -13,6 +13,8 @@ * */ +#include + /* * Meaning of the names I chose (vaxlinux people feel free to correct them): * swahw32 swap 16-bit half-words in a 32-bit word diff --git a/linux-2.6/include/linux/cm4000_cs.h b/linux-2.6/include/linux/cm4000_cs.h index 605ebe2..8d95b2f 100644 --- a/linux-2.6/include/linux/cm4000_cs.h +++ b/linux-2.6/include/linux/cm4000_cs.h @@ -1,6 +1,9 @@ #ifndef _CM4000_H_ #define _CM4000_H_ +#include +#include + #define MAX_ATR 33 #define CM4000_MAX_DEV 4 diff --git a/linux-2.6/include/linux/dirent.h b/linux-2.6/include/linux/dirent.h index 5d6023b..d5b642d 100644 --- a/linux-2.6/include/linux/dirent.h +++ b/linux-2.6/include/linux/dirent.h @@ -1,6 +1,8 @@ #ifndef _LINUX_DIRENT_H #define _LINUX_DIRENT_H +#include + struct dirent { long d_ino; __kernel_off_t d_off; diff --git a/linux-2.6/include/linux/dlm.h b/linux-2.6/include/linux/dlm.h index 1b1dcb9..415c400 100644 --- a/linux-2.6/include/linux/dlm.h +++ b/linux-2.6/include/linux/dlm.h @@ -19,6 +19,8 @@ * routines and structures to use DLM lockspaces */ +#include + /* * Lock Modes */ diff --git a/linux-2.6/include/linux/dlm_device.h b/linux-2.6/include/linux/dlm_device.h index 2a2dd18..52544a0 100644 --- a/linux-2.6/include/linux/dlm_device.h +++ b/linux-2.6/include/linux/dlm_device.h @@ -11,10 +11,16 @@ ******************************************************************************* ******************************************************************************/ +#ifndef _LINUX_DLM_DEVICE_H +#define _LINUX_DLM_DEVICE_H + /* This is the device interface for dlm, most users will use a library * interface. */ +#include +#include + #define DLM_USER_LVB_LEN 32 /* Version of the device interface */ @@ -84,3 +90,4 @@ struct dlm_lock_result { #define DLM_USER_LSFLG_AUTOFREE 1 #define DLM_USER_LSFLG_FORCEFREE 2 +#endif diff --git a/linux-2.6/include/linux/dn.h b/linux-2.6/include/linux/dn.h index 10b6a6f..9a13dd6 100644 --- a/linux-2.6/include/linux/dn.h +++ b/linux-2.6/include/linux/dn.h @@ -7,6 +7,9 @@ */ +#include +#include + /* * DNPROTO_NSP can't be the same as SOL_SOCKET, * so increment each by one (compared to ULTRIX) diff --git a/linux-2.6/include/linux/efs_fs_sb.h b/linux-2.6/include/linux/efs_fs_sb.h index ff1945e..a742b29 100644 --- a/linux-2.6/include/linux/efs_fs_sb.h +++ b/linux-2.6/include/linux/efs_fs_sb.h @@ -10,6 +10,7 @@ #define __EFS_FS_SB_H__ #include +#include /* EFS superblock magic numbers */ #define EFS_MAGIC 0x072959 diff --git a/linux-2.6/include/linux/errqueue.h b/linux-2.6/include/linux/errqueue.h index 92f8d4f..ceb1454 100644 --- a/linux-2.6/include/linux/errqueue.h +++ b/linux-2.6/include/linux/errqueue.h @@ -1,6 +1,8 @@ #ifndef _LINUX_ERRQUEUE_H #define _LINUX_ERRQUEUE_H 1 +#include + struct sock_extended_err { __u32 ee_errno; diff --git a/linux-2.6/include/linux/ethtool.h b/linux-2.6/include/linux/ethtool.h index c6310ae..f6fd474 100644 --- a/linux-2.6/include/linux/ethtool.h +++ b/linux-2.6/include/linux/ethtool.h @@ -12,6 +12,7 @@ #ifndef _LINUX_ETHTOOL_H #define _LINUX_ETHTOOL_H +#include /* This should work for both 32 and 64 bit userland. */ struct ethtool_cmd { diff --git a/linux-2.6/include/linux/gfs2_ondisk.h b/linux-2.6/include/linux/gfs2_ondisk.h index 8b7e4c1..e707cb5 100644 --- a/linux-2.6/include/linux/gfs2_ondisk.h +++ b/linux-2.6/include/linux/gfs2_ondisk.h @@ -10,6 +10,8 @@ #ifndef __GFS2_ONDISK_DOT_H__ #define __GFS2_ONDISK_DOT_H__ +#include + #define GFS2_MAGIC 0x01161970 #define GFS2_BASIC_BLOCK 512 #define GFS2_BASIC_BLOCK_SHIFT 9 diff --git a/linux-2.6/include/linux/hiddev.h b/linux-2.6/include/linux/hiddev.h index acbdae6..3b35f72 100644 --- a/linux-2.6/include/linux/hiddev.h +++ b/linux-2.6/include/linux/hiddev.h @@ -29,6 +29,8 @@ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic */ +#include + /* * The event structure itself */ diff --git a/linux-2.6/include/linux/i2o-dev.h b/linux-2.6/include/linux/i2o-dev.h index c2519df..1697662 100644 --- a/linux-2.6/include/linux/i2o-dev.h +++ b/linux-2.6/include/linux/i2o-dev.h @@ -24,6 +24,7 @@ #define MAX_I2O_CONTROLLERS 32 #include +#include /* * I2O Control IOCTLs and structures diff --git a/linux-2.6/include/linux/if_fc.h b/linux-2.6/include/linux/if_fc.h index 376a34e..6ed7f1b 100644 --- a/linux-2.6/include/linux/if_fc.h +++ b/linux-2.6/include/linux/if_fc.h @@ -20,6 +20,7 @@ #ifndef _LINUX_IF_FC_H #define _LINUX_IF_FC_H +#include #define FC_ALEN 6 /* Octets in one ethernet addr */ #define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) diff --git a/linux-2.6/include/linux/if_fddi.h b/linux-2.6/include/linux/if_fddi.h index e0a1500..58ada1f 100644 --- a/linux-2.6/include/linux/if_fddi.h +++ b/linux-2.6/include/linux/if_fddi.h @@ -24,6 +24,8 @@ #ifndef _LINUX_IF_FDDI_H #define _LINUX_IF_FDDI_H +#include + /* * Define max and min legal sizes. The frame sizes do not include * 4 byte FCS/CRC (frame check sequence). diff --git a/linux-2.6/include/linux/if_ppp.h b/linux-2.6/include/linux/if_ppp.h index 768372f..ad859a2 100644 --- a/linux-2.6/include/linux/if_ppp.h +++ b/linux-2.6/include/linux/if_ppp.h @@ -36,6 +36,8 @@ #define _IF_PPP_H_ #include +#include +#include /* * Packet sizes diff --git a/linux-2.6/include/linux/if_shaper.h b/linux-2.6/include/linux/if_shaper.h index 68c896a..6d5038e 100644 --- a/linux-2.6/include/linux/if_shaper.h +++ b/linux-2.6/include/linux/if_shaper.h @@ -1,6 +1,8 @@ #ifndef __LINUX_SHAPER_H #define __LINUX_SHAPER_H +#include + #ifdef __KERNEL__ #define SHAPER_QLEN 10 diff --git a/linux-2.6/include/linux/if_strip.h b/linux-2.6/include/linux/if_strip.h index fb5c5c9..6526a62 100644 --- a/linux-2.6/include/linux/if_strip.h +++ b/linux-2.6/include/linux/if_strip.h @@ -18,6 +18,8 @@ #ifndef __LINUX_STRIP_H #define __LINUX_STRIP_H +#include + typedef struct { __u8 c[6]; } MetricomAddress; diff --git a/linux-2.6/include/linux/inet_diag.h b/linux-2.6/include/linux/inet_diag.h index 6e8bc54..bc8c490 100644 --- a/linux-2.6/include/linux/inet_diag.h +++ b/linux-2.6/include/linux/inet_diag.h @@ -1,6 +1,8 @@ #ifndef _INET_DIAG_H_ #define _INET_DIAG_H_ 1 +#include + /* Just some random number */ #define TCPDIAG_GETSOCK 18 #define DCCPDIAG_GETSOCK 19 diff --git a/linux-2.6/include/linux/ipx.h b/linux-2.6/include/linux/ipx.h index eb19b4e..22d379f 100644 --- a/linux-2.6/include/linux/ipx.h +++ b/linux-2.6/include/linux/ipx.h @@ -2,6 +2,7 @@ #define _IPX_H_ #include #include +#include #define IPX_NODE_LEN 6 #define IPX_MTU 576 diff --git a/linux-2.6/include/linux/irda.h b/linux-2.6/include/linux/irda.h index 09d8f10..b41984f 100644 --- a/linux-2.6/include/linux/irda.h +++ b/linux-2.6/include/linux/irda.h @@ -31,6 +31,9 @@ * this one, or preferably to include instead. * Jean II */ +#include +#include + /* Hint bit positions for first hint byte */ #define HINT_PNP 0x01 #define HINT_PDA 0x02 diff --git a/linux-2.6/include/linux/lock_dlm_plock.h b/linux-2.6/include/linux/lock_dlm_plock.h index fc34151..d3c2a54 100644 --- a/linux-2.6/include/linux/lock_dlm_plock.h +++ b/linux-2.6/include/linux/lock_dlm_plock.h @@ -9,6 +9,8 @@ #ifndef __LOCK_DLM_PLOCK_DOT_H__ #define __LOCK_DLM_PLOCK_DOT_H__ +#include + #define GDLM_PLOCK_MISC_NAME "lock_dlm_plock" #define GDLM_PLOCK_VERSION_MAJOR 1 diff --git a/linux-2.6/include/linux/minix_fs.h b/linux-2.6/include/linux/minix_fs.h index 916e8f7..bb33d11 100644 --- a/linux-2.6/include/linux/minix_fs.h +++ b/linux-2.6/include/linux/minix_fs.h @@ -2,6 +2,7 @@ #define _LINUX_MINIX_FS_H #include +#include /* * The minix filesystem constants/structures diff --git a/linux-2.6/include/linux/netfilter/x_tables.h b/linux-2.6/include/linux/netfilter/x_tables.h index 022edfa..175741c 100644 --- a/linux-2.6/include/linux/netfilter/x_tables.h +++ b/linux-2.6/include/linux/netfilter/x_tables.h @@ -1,6 +1,8 @@ #ifndef _X_TABLES_H #define _X_TABLES_H +#include + #define XT_FUNCTION_MAXNAMELEN 30 #define XT_TABLE_MAXNAMELEN 32 diff --git a/linux-2.6/include/linux/netrom.h b/linux-2.6/include/linux/netrom.h index 6939b32..af7313c 100644 --- a/linux-2.6/include/linux/netrom.h +++ b/linux-2.6/include/linux/netrom.h @@ -7,6 +7,8 @@ #ifndef NETROM_KERNEL_H #define NETROM_KERNEL_H +#include + #define NETROM_MTU 236 #define NETROM_T1 1 diff --git a/linux-2.6/include/linux/nfs_idmap.h b/linux-2.6/include/linux/nfs_idmap.h index 15a9f3b..91a1c24 100644 --- a/linux-2.6/include/linux/nfs_idmap.h +++ b/linux-2.6/include/linux/nfs_idmap.h @@ -37,6 +37,8 @@ #ifndef NFS_IDMAP_H #define NFS_IDMAP_H +#include + /* XXX from bits/utmp.h */ #define IDMAP_NAMESZ 128 diff --git a/linux-2.6/include/linux/nubus.h b/linux-2.6/include/linux/nubus.h index 870e66a..72c8774 100644 --- a/linux-2.6/include/linux/nubus.h +++ b/linux-2.6/include/linux/nubus.h @@ -12,6 +12,8 @@ #ifndef LINUX_NUBUS_H #define LINUX_NUBUS_H +#include + #ifdef __KERNEL__ #include #endif diff --git a/linux-2.6/include/linux/pkt_cls.h b/linux-2.6/include/linux/pkt_cls.h index c3f01b3..762f048 100644 --- a/linux-2.6/include/linux/pkt_cls.h +++ b/linux-2.6/include/linux/pkt_cls.h @@ -2,6 +2,7 @@ #define __LINUX_PKT_CLS_H #include +#include /* I think i could have done better macros ; for now this is stolen from * some arch/mips code - jhs diff --git a/linux-2.6/include/linux/pkt_sched.h b/linux-2.6/include/linux/pkt_sched.h index d10f353..2169d79 100644 --- a/linux-2.6/include/linux/pkt_sched.h +++ b/linux-2.6/include/linux/pkt_sched.h @@ -1,6 +1,8 @@ #ifndef __LINUX_PKT_SCHED_H #define __LINUX_PKT_SCHED_H +#include + /* Logical priority bands not depending on specific packet scheduler. Every scheduler will map them to real traffic classes, if it has no more precise mechanism to classify packets. diff --git a/linux-2.6/include/linux/ppp_defs.h b/linux-2.6/include/linux/ppp_defs.h index c6b13ff..a71510a 100644 --- a/linux-2.6/include/linux/ppp_defs.h +++ b/linux-2.6/include/linux/ppp_defs.h @@ -42,6 +42,8 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ +#include + /* * The basic PPP frame. */ diff --git a/linux-2.6/include/linux/random.h b/linux-2.6/include/linux/random.h index 01ad710..57195d0 100644 --- a/linux-2.6/include/linux/random.h +++ b/linux-2.6/include/linux/random.h @@ -8,6 +8,7 @@ #define _LINUX_RANDOM_H #include +#include /* ioctl()'s for the random number generator */ diff --git a/linux-2.6/include/linux/romfs_fs.h b/linux-2.6/include/linux/romfs_fs.h index e20bbf9..1404f8d 100644 --- a/linux-2.6/include/linux/romfs_fs.h +++ b/linux-2.6/include/linux/romfs_fs.h @@ -1,6 +1,8 @@ #ifndef __LINUX_ROMFS_FS_H #define __LINUX_ROMFS_FS_H +#include + /* The basic structures of the romfs filesystem */ #define ROMBSIZE BLOCK_SIZE diff --git a/linux-2.6/include/linux/selinux_netlink.h b/linux-2.6/include/linux/selinux_netlink.h index bbf489d..faf9675 100644 --- a/linux-2.6/include/linux/selinux_netlink.h +++ b/linux-2.6/include/linux/selinux_netlink.h @@ -12,6 +12,8 @@ #ifndef _LINUX_SELINUX_NETLINK_H #define _LINUX_SELINUX_NETLINK_H +#include + /* Message types. */ #define SELNL_MSG_BASE 0x10 enum { diff --git a/linux-2.6/include/linux/socket.h b/linux-2.6/include/linux/socket.h index 92cd38e..545c041 100644 diff --git a/linux-2.6/include/linux/synclink.h b/linux-2.6/include/linux/synclink.h index c8b0426..ba59b6d 100644 --- a/linux-2.6/include/linux/synclink.h +++ b/linux-2.6/include/linux/synclink.h @@ -11,6 +11,9 @@ #ifndef _SYNCLINK_H_ #define _SYNCLINK_H_ + +#include + #define SYNCLINK_H_VERSION 3.6 #define BOOLEAN int diff --git a/linux-2.6/include/linux/video_decoder.h b/linux-2.6/include/linux/video_decoder.h index 121e26d..e26c0c8 100644 --- a/linux-2.6/include/linux/video_decoder.h +++ b/linux-2.6/include/linux/video_decoder.h @@ -1,6 +1,8 @@ #ifndef _LINUX_VIDEO_DECODER_H #define _LINUX_VIDEO_DECODER_H +#include + #define HAVE_VIDEO_DECODER 1 struct video_decoder_capability { /* this name is too long */ diff --git a/linux-2.6/include/linux/video_encoder.h b/linux-2.6/include/linux/video_encoder.h index 4b0e690..b7b6423 100644 --- a/linux-2.6/include/linux/video_encoder.h +++ b/linux-2.6/include/linux/video_encoder.h @@ -1,6 +1,8 @@ #ifndef _LINUX_VIDEO_ENCODER_H #define _LINUX_VIDEO_ENCODER_H +#include + struct video_encoder_capability { /* this name is too long */ __u32 flags; #define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ diff --git a/linux-2.6/include/linux/videodev2.h b/linux-2.6/include/linux/videodev2.h diff --git a/linux-2.6/include/linux/wireless.h b/linux-2.6/include/linux/wireless.h index 7c269f4..9ba6355 100644 --- a/linux-2.6/include/linux/wireless.h +++ b/linux-2.6/include/linux/wireless.h @@ -72,11 +72,9 @@ /* This header is used in user-space, therefore need to be sanitised * for that purpose. Those includes are usually not compatible with glibc. * To know which includes to use in user-space, check iwlib.h. */ -#ifdef __KERNEL__ #include /* for "caddr_t" et al */ #include /* for "struct sockaddr" et al */ #include /* for IFNAMSIZ and co... */ -#endif /* __KERNEL__ */ /***************************** VERSION *****************************/ /*