diff options
-rw-r--r-- | include/asm-arm/posix_types.h | 6 | ||||
-rw-r--r-- | include/asm-avr32/posix_types.h | 4 | ||||
-rw-r--r-- | include/asm-blackfin/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-cris/posix_types.h | 4 | ||||
-rw-r--r-- | include/asm-frv/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-h8300/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-m32r/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-m68k/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-mips/posix_types.h | 4 | ||||
-rw-r--r-- | include/asm-parisc/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-powerpc/posix_types.h | 5 | ||||
-rw-r--r-- | include/asm-sparc/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-sparc64/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-v850/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-x86/posix_types_32.h | 8 | ||||
-rw-r--r-- | include/asm-xtensa/posix_types.h | 5 |
16 files changed, 27 insertions, 81 deletions
diff --git a/include/asm-arm/posix_types.h b/include/asm-arm/posix_types.h index e142a2a016ca..c37379dadcb2 100644 --- a/include/asm-arm/posix_types.h +++ b/include/asm-arm/posix_types.h | |||
@@ -51,14 +51,10 @@ typedef long long __kernel_loff_t; | |||
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | typedef struct { | 53 | typedef struct { |
54 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
55 | int val[2]; | 54 | int val[2]; |
56 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
57 | int __val[2]; | ||
58 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
59 | } __kernel_fsid_t; | 55 | } __kernel_fsid_t; |
60 | 56 | ||
61 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 57 | #if defined(__KERNEL__) |
62 | 58 | ||
63 | #undef __FD_SET | 59 | #undef __FD_SET |
64 | #define __FD_SET(fd, fdsetp) \ | 60 | #define __FD_SET(fd, fdsetp) \ |
diff --git a/include/asm-avr32/posix_types.h b/include/asm-avr32/posix_types.h index 9e255b999639..fe0c0c014389 100644 --- a/include/asm-avr32/posix_types.h +++ b/include/asm-avr32/posix_types.h | |||
@@ -46,11 +46,7 @@ typedef long long __kernel_loff_t; | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | typedef struct { | 48 | typedef struct { |
49 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
50 | int val[2]; | 49 | int val[2]; |
51 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
52 | int __val[2]; | ||
53 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
54 | } __kernel_fsid_t; | 50 | } __kernel_fsid_t; |
55 | 51 | ||
56 | #if defined(__KERNEL__) | 52 | #if defined(__KERNEL__) |
diff --git a/include/asm-blackfin/posix_types.h b/include/asm-blackfin/posix_types.h index c3fa50fa50b8..23aa1f8c1bd1 100644 --- a/include/asm-blackfin/posix_types.h +++ b/include/asm-blackfin/posix_types.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | 48 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) |
@@ -60,6 +56,6 @@ typedef struct { | |||
60 | #undef __FD_ZERO | 56 | #undef __FD_ZERO |
61 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | 57 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) |
62 | 58 | ||
63 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 59 | #endif /* defined(__KERNEL__) */ |
64 | 60 | ||
65 | #endif | 61 | #endif |
diff --git a/include/asm-cris/posix_types.h b/include/asm-cris/posix_types.h index 3a5e4c43eae7..ce3fb25a460b 100644 --- a/include/asm-cris/posix_types.h +++ b/include/asm-cris/posix_types.h | |||
@@ -44,11 +44,7 @@ typedef long long __kernel_loff_t; | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | typedef struct { | 46 | typedef struct { |
47 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
48 | int val[2]; | 47 | int val[2]; |
49 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
50 | int __val[2]; | ||
51 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
52 | } __kernel_fsid_t; | 48 | } __kernel_fsid_t; |
53 | 49 | ||
54 | #ifdef __KERNEL__ | 50 | #ifdef __KERNEL__ |
diff --git a/include/asm-frv/posix_types.h b/include/asm-frv/posix_types.h index 73c2ba8d76b4..a9f1f5be0632 100644 --- a/include/asm-frv/posix_types.h +++ b/include/asm-frv/posix_types.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | 48 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) |
@@ -60,7 +56,7 @@ typedef struct { | |||
60 | #undef __FD_ZERO | 56 | #undef __FD_ZERO |
61 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | 57 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) |
62 | 58 | ||
63 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 59 | #endif /* defined(__KERNEL__) */ |
64 | 60 | ||
65 | #endif | 61 | #endif |
66 | 62 | ||
diff --git a/include/asm-h8300/posix_types.h b/include/asm-h8300/posix_types.h index 7de94b1fd0e5..5c553927fc53 100644 --- a/include/asm-h8300/posix_types.h +++ b/include/asm-h8300/posix_types.h | |||
@@ -38,14 +38,10 @@ typedef long long __kernel_loff_t; | |||
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | typedef struct { | 40 | typedef struct { |
41 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
42 | int val[2]; | 41 | int val[2]; |
43 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
44 | int __val[2]; | ||
45 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
46 | } __kernel_fsid_t; | 42 | } __kernel_fsid_t; |
47 | 43 | ||
48 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 44 | #if defined(__KERNEL__) |
49 | 45 | ||
50 | #undef __FD_SET | 46 | #undef __FD_SET |
51 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | 47 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) |
@@ -59,6 +55,6 @@ typedef struct { | |||
59 | #undef __FD_ZERO | 55 | #undef __FD_ZERO |
60 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | 56 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) |
61 | 57 | ||
62 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 58 | #endif /* defined(__KERNEL__) */ |
63 | 59 | ||
64 | #endif | 60 | #endif |
diff --git a/include/asm-m32r/posix_types.h b/include/asm-m32r/posix_types.h index 1caac65d208f..b309c5858637 100644 --- a/include/asm-m32r/posix_types.h +++ b/include/asm-m32r/posix_types.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | 48 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) |
@@ -117,6 +113,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p) | |||
117 | } | 113 | } |
118 | } | 114 | } |
119 | 115 | ||
120 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 116 | #endif /* defined(__KERNEL__) */ |
121 | 117 | ||
122 | #endif /* _ASM_M32R_POSIX_TYPES_H */ | 118 | #endif /* _ASM_M32R_POSIX_TYPES_H */ |
diff --git a/include/asm-m68k/posix_types.h b/include/asm-m68k/posix_types.h index fa166ee30286..63cdcc142d93 100644 --- a/include/asm-m68k/posix_types.h +++ b/include/asm-m68k/posix_types.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | 48 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) |
@@ -60,6 +56,6 @@ typedef struct { | |||
60 | #undef __FD_ZERO | 56 | #undef __FD_ZERO |
61 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | 57 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) |
62 | 58 | ||
63 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 59 | #endif /* defined(__KERNEL__) */ |
64 | 60 | ||
65 | #endif | 61 | #endif |
diff --git a/include/asm-mips/posix_types.h b/include/asm-mips/posix_types.h index c2e8a0070daf..c200102c8586 100644 --- a/include/asm-mips/posix_types.h +++ b/include/asm-mips/posix_types.h | |||
@@ -69,7 +69,7 @@ typedef struct { | |||
69 | #endif | 69 | #endif |
70 | } __kernel_fsid_t; | 70 | } __kernel_fsid_t; |
71 | 71 | ||
72 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 72 | #if defined(__KERNEL__) |
73 | 73 | ||
74 | #undef __FD_SET | 74 | #undef __FD_SET |
75 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | 75 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) |
@@ -139,6 +139,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p) | |||
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
142 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 142 | #endif /* defined(__KERNEL__) */ |
143 | 143 | ||
144 | #endif /* _ASM_POSIX_TYPES_H */ | 144 | #endif /* _ASM_POSIX_TYPES_H */ |
diff --git a/include/asm-parisc/posix_types.h b/include/asm-parisc/posix_types.h index b634e3c47fdc..bb725a6630bb 100644 --- a/include/asm-parisc/posix_types.h +++ b/include/asm-parisc/posix_types.h | |||
@@ -47,18 +47,14 @@ typedef unsigned long long __kernel_ino64_t; | |||
47 | typedef unsigned int __kernel_old_dev_t; | 47 | typedef unsigned int __kernel_old_dev_t; |
48 | 48 | ||
49 | typedef struct { | 49 | typedef struct { |
50 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
51 | int val[2]; | 50 | int val[2]; |
52 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
53 | int __val[2]; | ||
54 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
55 | } __kernel_fsid_t; | 51 | } __kernel_fsid_t; |
56 | 52 | ||
57 | /* compatibility stuff */ | 53 | /* compatibility stuff */ |
58 | typedef __kernel_uid_t __kernel_old_uid_t; | 54 | typedef __kernel_uid_t __kernel_old_uid_t; |
59 | typedef __kernel_gid_t __kernel_old_gid_t; | 55 | typedef __kernel_gid_t __kernel_old_gid_t; |
60 | 56 | ||
61 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 57 | #if defined(__KERNEL__) |
62 | 58 | ||
63 | #undef __FD_SET | 59 | #undef __FD_SET |
64 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | 60 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) |
@@ -128,6 +124,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p) | |||
128 | } | 124 | } |
129 | } | 125 | } |
130 | 126 | ||
131 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 127 | #endif /* defined(__KERNEL__) */ |
132 | 128 | ||
133 | #endif | 129 | #endif |
diff --git a/include/asm-powerpc/posix_types.h b/include/asm-powerpc/posix_types.h index 2f2288f520be..c4e396b540df 100644 --- a/include/asm-powerpc/posix_types.h +++ b/include/asm-powerpc/posix_types.h | |||
@@ -64,8 +64,7 @@ typedef struct { | |||
64 | 64 | ||
65 | #else /* __GNUC__ */ | 65 | #else /* __GNUC__ */ |
66 | 66 | ||
67 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) \ | 67 | #if defined(__KERNEL__) |
68 | || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0) | ||
69 | /* With GNU C, use inline functions instead so args are evaluated only once: */ | 68 | /* With GNU C, use inline functions instead so args are evaluated only once: */ |
70 | 69 | ||
71 | #undef __FD_SET | 70 | #undef __FD_SET |
@@ -124,6 +123,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p) | |||
124 | } | 123 | } |
125 | } | 124 | } |
126 | 125 | ||
127 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 126 | #endif /* defined(__KERNEL__) */ |
128 | #endif /* __GNUC__ */ | 127 | #endif /* __GNUC__ */ |
129 | #endif /* _ASM_POWERPC_POSIX_TYPES_H */ | 128 | #endif /* _ASM_POWERPC_POSIX_TYPES_H */ |
diff --git a/include/asm-sparc/posix_types.h b/include/asm-sparc/posix_types.h index 62c8fa7b36d4..dcc07eb5e181 100644 --- a/include/asm-sparc/posix_types.h +++ b/include/asm-sparc/posix_types.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) | 48 | static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) |
@@ -117,6 +113,6 @@ static inline void __FD_ZERO(__kernel_fd_set *p) | |||
117 | } | 113 | } |
118 | } | 114 | } |
119 | 115 | ||
120 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 116 | #endif /* defined(__KERNEL__) */ |
121 | 117 | ||
122 | #endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */ | 118 | #endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */ |
diff --git a/include/asm-sparc64/posix_types.h b/include/asm-sparc64/posix_types.h index 3426a65ecd35..4eaaa0196636 100644 --- a/include/asm-sparc64/posix_types.h +++ b/include/asm-sparc64/posix_types.h | |||
@@ -43,14 +43,10 @@ typedef long long __kernel_loff_t; | |||
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | typedef struct { | 45 | typedef struct { |
46 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
47 | int val[2]; | 46 | int val[2]; |
48 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
49 | int __val[2]; | ||
50 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
51 | } __kernel_fsid_t; | 47 | } __kernel_fsid_t; |
52 | 48 | ||
53 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 49 | #if defined(__KERNEL__) |
54 | 50 | ||
55 | #undef __FD_SET | 51 | #undef __FD_SET |
56 | static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) | 52 | static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) |
@@ -121,6 +117,6 @@ static inline void __FD_ZERO(__kernel_fd_set *p) | |||
121 | } | 117 | } |
122 | } | 118 | } |
123 | 119 | ||
124 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 120 | #endif /* defined(__KERNEL__) */ |
125 | 121 | ||
126 | #endif /* !(__ARCH_SPARC64_POSIX_TYPES_H) */ | 122 | #endif /* !(__ARCH_SPARC64_POSIX_TYPES_H) */ |
diff --git a/include/asm-v850/posix_types.h b/include/asm-v850/posix_types.h index ccb7297a0edc..7f403b765390 100644 --- a/include/asm-v850/posix_types.h +++ b/include/asm-v850/posix_types.h | |||
@@ -44,15 +44,11 @@ typedef __kernel_uid_t __kernel_old_uid_t; | |||
44 | typedef unsigned int __kernel_old_dev_t; | 44 | typedef unsigned int __kernel_old_dev_t; |
45 | 45 | ||
46 | typedef struct { | 46 | typedef struct { |
47 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
48 | int val[2]; | 47 | int val[2]; |
49 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
50 | int __val[2]; | ||
51 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
52 | } __kernel_fsid_t; | 48 | } __kernel_fsid_t; |
53 | 49 | ||
54 | 50 | ||
55 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 51 | #if defined(__KERNEL__) |
56 | 52 | ||
57 | /* We used to include <asm/bitops.h> here, which seems the right thing, but | 53 | /* We used to include <asm/bitops.h> here, which seems the right thing, but |
58 | it caused nasty include-file definition order problems. Removing the | 54 | it caused nasty include-file definition order problems. Removing the |
@@ -71,6 +67,6 @@ typedef struct { | |||
71 | #define __FD_ZERO(fd_set) \ | 67 | #define __FD_ZERO(fd_set) \ |
72 | memset (fd_set, 0, sizeof (*(fd_set *)fd_set)) | 68 | memset (fd_set, 0, sizeof (*(fd_set *)fd_set)) |
73 | 69 | ||
74 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 70 | #endif /* defined(__KERNEL__) */ |
75 | 71 | ||
76 | #endif /* __V850_POSIX_TYPES_H__ */ | 72 | #endif /* __V850_POSIX_TYPES_H__ */ |
diff --git a/include/asm-x86/posix_types_32.h b/include/asm-x86/posix_types_32.h index 133e31e7dfde..015e539cdef5 100644 --- a/include/asm-x86/posix_types_32.h +++ b/include/asm-x86/posix_types_32.h | |||
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | typedef struct { | 41 | typedef struct { |
42 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
43 | int val[2]; | 42 | int val[2]; |
44 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
45 | int __val[2]; | ||
46 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
47 | } __kernel_fsid_t; | 43 | } __kernel_fsid_t; |
48 | 44 | ||
49 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 45 | #if defined(__KERNEL__) |
50 | 46 | ||
51 | #undef __FD_SET | 47 | #undef __FD_SET |
52 | #define __FD_SET(fd,fdsetp) \ | 48 | #define __FD_SET(fd,fdsetp) \ |
@@ -77,6 +73,6 @@ do { \ | |||
77 | "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \ | 73 | "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \ |
78 | } while (0) | 74 | } while (0) |
79 | 75 | ||
80 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 76 | #endif /* defined(__KERNEL__) */ |
81 | 77 | ||
82 | #endif | 78 | #endif |
diff --git a/include/asm-xtensa/posix_types.h b/include/asm-xtensa/posix_types.h index 4ad77dda6d5f..43f9dd1126a4 100644 --- a/include/asm-xtensa/posix_types.h +++ b/include/asm-xtensa/posix_types.h | |||
@@ -64,8 +64,7 @@ typedef struct { | |||
64 | 64 | ||
65 | #else /* __GNUC__ */ | 65 | #else /* __GNUC__ */ |
66 | 66 | ||
67 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) \ | 67 | #if defined(__KERNEL__) |
68 | || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0) | ||
69 | /* With GNU C, use inline functions instead so args are evaluated only once: */ | 68 | /* With GNU C, use inline functions instead so args are evaluated only once: */ |
70 | 69 | ||
71 | #undef __FD_SET | 70 | #undef __FD_SET |
@@ -118,6 +117,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p) | |||
118 | } | 117 | } |
119 | } | 118 | } |
120 | 119 | ||
121 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 120 | #endif /* defined(__KERNEL__) */ |
122 | #endif /* __GNUC__ */ | 121 | #endif /* __GNUC__ */ |
123 | #endif /* _XTENSA_POSIX_TYPES_H */ | 122 | #endif /* _XTENSA_POSIX_TYPES_H */ |