diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2008-02-08 07:20:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:34 -0500 |
| commit | 531d7d4256f3726b93f7a91f97132a944ab28148 (patch) | |
| tree | 24c9e99d52948ecb7d36cf2a0894096bb4d490ea /include/asm-parisc | |
| parent | 90b315af12b427eeb09b2812343fb4ef9d01cf17 (diff) | |
asm-*/posix_types.h: scrub __GLIBC__
Some arches (like alpha and ia64) already have a clean posix_types.h header.
This brings all the others in line by removing all references to __GLIBC__
(and some undocumented __USE_ALL).
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Ulrich Drepper <drepper@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-parisc')
| -rw-r--r-- | include/asm-parisc/posix_types.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-parisc/posix_types.h b/include/asm-parisc/posix_types.h index b634e3c47fd..bb725a6630b 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 |
