From: Rich Felker Date: Sat, 27 Aug 2011 23:42:13 +0000 (-0400) Subject: fix broken FD_* macros on 64-bit targets X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=1f5ff26cd788d29c77e322e7584da46466723572 fix broken FD_* macros on 64-bit targets 1 is too small if int is 32-bit but unsigned long is 64-bit. be explicit and use 1UL. --- diff --git a/include/sys/select.h b/include/sys/select.h index 7cb0af43..cbe35a4f 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -23,9 +23,9 @@ typedef struct } fd_set; #define FD_ZERO(s) do { int __i; unsigned long *__b=(s)->fds_bits; for(__i=sizeof (fd_set)/sizeof (long); __i; __i--) *__b++=0; } while(0) -#define FD_SET(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] |= (1<<((d)%(8*sizeof(long))))) -#define FD_CLR(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] &= ~(1<<((d)%(8*sizeof(long))))) -#define FD_ISSET(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] & (1<<((d)%(8*sizeof(long))))) +#define FD_SET(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] |= (1UL<<((d)%(8*sizeof(long))))) +#define FD_CLR(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] &= ~(1UL<<((d)%(8*sizeof(long))))) +#define FD_ISSET(d, s) ((s)->fds_bits[(d)/(8*sizeof(long))] & (1UL<<((d)%(8*sizeof(long))))) int select (int, fd_set *, fd_set *, fd_set *, struct timeval *); int pselect (int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *);