Skip to content

L
linux
Commit 531d7d42 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files
Options

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: default avatarMike Frysinger <vapier@gentoo.org>
Acked-by: default avatarIngo 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 90b315af
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 81 deletions
include/asm-arm/posix_types.h
View file @ 531d7d42
...@@ -51,14 +51,10 @@ typedef long long __kernel_loff_t; ...@@ -51,14 +51,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(fd, fdsetp) \ #define __FD_SET(fd, fdsetp) \
......
include/asm-avr32/posix_types.h
View file @ 531d7d42
...@@ -46,11 +46,7 @@ typedef long long __kernel_loff_t; ...@@ -46,11 +46,7 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) #if defined(__KERNEL__)
......
include/asm-blackfin/posix_types.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
...@@ -60,6 +56,6 @@ typedef struct { ...@@ -60,6 +56,6 @@ typedef struct {
#undef __FD_ZERO #undef __FD_ZERO
#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-cris/posix_types.h
View file @ 531d7d42
...@@ -44,11 +44,7 @@ typedef long long __kernel_loff_t; ...@@ -44,11 +44,7 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
......
include/asm-frv/posix_types.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
...@@ -60,7 +56,7 @@ typedef struct { ...@@ -60,7 +56,7 @@ typedef struct {
#undef __FD_ZERO #undef __FD_ZERO
#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-h8300/posix_types.h
View file @ 531d7d42
...@@ -38,14 +38,10 @@ typedef long long __kernel_loff_t; ...@@ -38,14 +38,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
...@@ -59,6 +55,6 @@ typedef struct { ...@@ -59,6 +55,6 @@ typedef struct {
#undef __FD_ZERO #undef __FD_ZERO
#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-m32r/posix_types.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) 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,6 +113,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* _ASM_M32R_POSIX_TYPES_H */ #endif /* _ASM_M32R_POSIX_TYPES_H */
include/asm-m68k/posix_types.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
...@@ -60,6 +56,6 @@ typedef struct { ...@@ -60,6 +56,6 @@ typedef struct {
#undef __FD_ZERO #undef __FD_ZERO
#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-mips/posix_types.h
View file @ 531d7d42
...@@ -69,7 +69,7 @@ typedef struct { ...@@ -69,7 +69,7 @@ typedef struct {
#endif #endif
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) 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,6 +139,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* _ASM_POSIX_TYPES_H */ #endif /* _ASM_POSIX_TYPES_H */
include/asm-parisc/posix_types.h
View file @ 531d7d42
...@@ -47,18 +47,14 @@ typedef unsigned long long __kernel_ino64_t; ...@@ -47,18 +47,14 @@ typedef unsigned long long __kernel_ino64_t;
typedef unsigned int __kernel_old_dev_t; typedef unsigned int __kernel_old_dev_t;
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
/* compatibility stuff */ /* compatibility stuff */
typedef __kernel_uid_t __kernel_old_uid_t; typedef __kernel_uid_t __kernel_old_uid_t;
typedef __kernel_gid_t __kernel_old_gid_t; typedef __kernel_gid_t __kernel_old_gid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) 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,6 +124,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-powerpc/posix_types.h
View file @ 531d7d42
...@@ -64,8 +64,7 @@ typedef struct { ...@@ -64,8 +64,7 @@ typedef struct {
#else /* __GNUC__ */ #else /* __GNUC__ */
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) \ #if defined(__KERNEL__)
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
/* With GNU C, use inline functions instead so args are evaluated only once: */ /* With GNU C, use inline functions instead so args are evaluated only once: */
#undef __FD_SET #undef __FD_SET
...@@ -124,6 +123,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p) ...@@ -124,6 +123,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#endif /* _ASM_POWERPC_POSIX_TYPES_H */ #endif /* _ASM_POWERPC_POSIX_TYPES_H */
include/asm-sparc/posix_types.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) 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,6 +113,6 @@ static inline void __FD_ZERO(__kernel_fd_set *p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */ #endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */
include/asm-sparc64/posix_types.h
View file @ 531d7d42
...@@ -43,14 +43,10 @@ typedef long long __kernel_loff_t; ...@@ -43,14 +43,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) 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,6 +117,6 @@ static inline void __FD_ZERO(__kernel_fd_set *p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* !(__ARCH_SPARC64_POSIX_TYPES_H) */ #endif /* !(__ARCH_SPARC64_POSIX_TYPES_H) */
include/asm-v850/posix_types.h
View file @ 531d7d42
...@@ -44,15 +44,11 @@ typedef __kernel_uid_t __kernel_old_uid_t; ...@@ -44,15 +44,11 @@ typedef __kernel_uid_t __kernel_old_uid_t;
typedef unsigned int __kernel_old_dev_t; typedef unsigned int __kernel_old_dev_t;
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
/* We used to include <asm/bitops.h> here, which seems the right thing, but /* We used to include <asm/bitops.h> here, which seems the right thing, but
it caused nasty include-file definition order problems. Removing the it caused nasty include-file definition order problems. Removing the
...@@ -71,6 +67,6 @@ typedef struct { ...@@ -71,6 +67,6 @@ typedef struct {
#define __FD_ZERO(fd_set) \ #define __FD_ZERO(fd_set) \
memset (fd_set, 0, sizeof (*(fd_set *)fd_set)) memset (fd_set, 0, sizeof (*(fd_set *)fd_set))
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* __V850_POSIX_TYPES_H__ */ #endif /* __V850_POSIX_TYPES_H__ */
include/asm-x86/posix_types_32.h
View file @ 531d7d42
...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; ...@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t;
#endif #endif
typedef struct { typedef struct {
#if defined(__KERNEL__) || defined(__USE_ALL)
int val[2]; int val[2];
#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
int __val[2];
#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
} __kernel_fsid_t; } __kernel_fsid_t;
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) #if defined(__KERNEL__)
#undef __FD_SET #undef __FD_SET
#define __FD_SET(fd,fdsetp) \ #define __FD_SET(fd,fdsetp) \
...@@ -77,6 +73,6 @@ do { \ ...@@ -77,6 +73,6 @@ do { \
"2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \ "2" ((__kernel_fd_set *) (fdsetp)) : "memory"); \
} while (0) } while (0)
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif #endif
include/asm-xtensa/posix_types.h
View file @ 531d7d42
...@@ -64,8 +64,7 @@ typedef struct { ...@@ -64,8 +64,7 @@ typedef struct {
#else /* __GNUC__ */ #else /* __GNUC__ */
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) \ #if defined(__KERNEL__)
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)
/* With GNU C, use inline functions instead so args are evaluated only once: */ /* With GNU C, use inline functions instead so args are evaluated only once: */
#undef __FD_SET #undef __FD_SET
...@@ -118,6 +117,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p) ...@@ -118,6 +117,6 @@ static __inline__ void __FD_ZERO(__kernel_fd_set *p)
} }
} }
#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif /* defined(__KERNEL__) */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#endif /* _XTENSA_POSIX_TYPES_H */ #endif /* _XTENSA_POSIX_TYPES_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7