diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-01-02 02:52:57 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-21 03:41:21 -0500 |
| commit | c2bcc4a7ffa7438a8ded91fbd0313c50d420ff45 (patch) | |
| tree | 11d0432ef3ce36766afbfe64bbc317a1c826a30c /arch/sh | |
| parent | 7bfa122c19e47b1dee47476ce6e9ed6ba16f8269 (diff) | |
asm-sh/posix_types_{32,64}.h: drop __GLIBC__/__USE_ALL usage
Bring sh in line with all the other ports. Not sure how sh missed this
change as all the other arches were being updated ...
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/posix_types_32.h | 8 | ||||
| -rw-r--r-- | arch/sh/include/asm/posix_types_64.h | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/sh/include/asm/posix_types_32.h b/arch/sh/include/asm/posix_types_32.h index 0a3d2f54ab27..2172732c55c8 100644 --- a/arch/sh/include/asm/posix_types_32.h +++ b/arch/sh/include/asm/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 | 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_SH_POSIX_TYPES_H */ | 118 | #endif /* __ASM_SH_POSIX_TYPES_H */ |
diff --git a/arch/sh/include/asm/posix_types_64.h b/arch/sh/include/asm/posix_types_64.h index 0620317a6f0f..f83e9bd463d8 100644 --- a/arch/sh/include/asm/posix_types_64.h +++ b/arch/sh/include/asm/posix_types_64.h | |||
| @@ -48,14 +48,10 @@ typedef long long __kernel_loff_t; | |||
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | typedef struct { | 50 | typedef struct { |
| 51 | #if defined(__KERNEL__) || defined(__USE_ALL) | ||
| 52 | int val[2]; | 51 | int val[2]; |
| 53 | #else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
| 54 | int __val[2]; | ||
| 55 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | ||
| 56 | } __kernel_fsid_t; | 52 | } __kernel_fsid_t; |
| 57 | 53 | ||
| 58 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 54 | #if defined(__KERNEL__) |
| 59 | 55 | ||
| 60 | #undef __FD_SET | 56 | #undef __FD_SET |
| 61 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | 57 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) |
| @@ -126,6 +122,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p) | |||
| 126 | } | 122 | } |
| 127 | } | 123 | } |
| 128 | 124 | ||
| 129 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 125 | #endif /* defined(__KERNEL__) */ |
| 130 | 126 | ||
| 131 | #endif /* __ASM_SH64_POSIX_TYPES_H */ | 127 | #endif /* __ASM_SH64_POSIX_TYPES_H */ |