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

Commit 5296f6d3 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

h8300/m68k/xtensa: __FD_ISSET should return 0/1 



Harmonise these return values with other architectures.  In some cases
this affects all compilers and in other cases non-gcc compilers only.

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Chris Zankel <chris@zankel.net>
Cc: Ulrich Drepper <drepper@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99b64567

arch/h8300/include/asm/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ typedef struct { 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))



#undef	__FD_ISSET

#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))

#define	__FD_ISSET(d, set)	(!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))



#undef	__FD_ZERO

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

arch/m68k/include/asm/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ typedef struct { 
#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))



#undef	__FD_ISSET

#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))

#define	__FD_ISSET(d, set)	(!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))



#undef	__FD_ZERO

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

arch/xtensa/include/asm/posix_types.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ typedef struct { 


#define	__FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))

#define	__FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))

#define	__FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))

#define	__FD_ISSET(d, set)	(!!((set)->fds_bits[__FDELT(d)] & __FDMASK(d)))

#define	__FD_ZERO(set)	\

  ((void) memset ((void *) (set), 0, sizeof (__kernel_fd_set)))