Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/asm-arm/posix_types.h

+1 −5
Original line number Diff line number Diff line
@@ -51,14 +51,10 @@ typedef long long __kernel_loff_t; 
#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

#if defined(__KERNEL__)



#undef	__FD_SET

#define __FD_SET(fd, fdsetp) \

include/asm-avr32/posix_types.h

+0 −4
Original line number Diff line number Diff line
@@ -46,11 +46,7 @@ typedef long long __kernel_loff_t; 
#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

    int     val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

    int     __val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__)

include/asm-blackfin/posix_types.h

+2 −6
Original line number Diff line number Diff line
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; 
#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int val[2];

#else				/* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int __val[2];

#endif				/* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

#if defined(__KERNEL__)



#undef	__FD_SET

#define	__FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
@@ -60,6 +56,6 @@ typedef struct { 
#undef	__FD_ZERO

#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))



#endif				/* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */

#endif				/* defined(__KERNEL__) */



#endif

include/asm-cris/posix_types.h

+0 −4
Original line number Diff line number Diff line
@@ -44,11 +44,7 @@ typedef long long __kernel_loff_t; 
#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#ifdef __KERNEL__

include/asm-frv/posix_types.h

+2 −6
Original line number Diff line number Diff line
@@ -39,14 +39,10 @@ typedef long long __kernel_loff_t; 
#endif



typedef struct {

#if defined(__KERNEL__) || defined(__USE_ALL)

	int	val[2];

#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */

	int	__val[2];

#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */

} __kernel_fsid_t;



#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

#if defined(__KERNEL__)



#undef	__FD_SET

#define	__FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
@@ -60,7 +56,7 @@ typedef struct { 
#undef	__FD_ZERO

#define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp)))



#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */

#endif /* defined(__KERNEL__) */



#endif