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

Commit c2bcc4a7 authored by Mike Frysinger's avatar Mike Frysinger Committed by Paul Mundt
Browse files

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: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 7bfa122c

arch/sh/include/asm/posix_types_32.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

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) 
	}

}



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

#endif /* defined(__KERNEL__) */



#endif /* __ASM_SH_POSIX_TYPES_H */

arch/sh/include/asm/posix_types_64.h

+2 −6
Original line number Diff line number Diff line
@@ -48,14 +48,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

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) 
	}

}



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

#endif /* defined(__KERNEL__) */



#endif /* __ASM_SH64_POSIX_TYPES_H */