FD_ISSET must return an int. this is the easiest way.

[musl] / include / sys / select.h

diff --git a/include/sys/select.h b/include/sys/select.h
index c44eada..47d195f 100644 (file)
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -6,6 +6,7 @@ extern "C" {
 
 #define __NEED_size_t
 #define __NEED_time_t
+#define __NEED_suseconds_t
 #define __NEED_struct_timeval
 #define __NEED_struct_timespec
 #define __NEED_sigset_t
@@ -14,15 +15,17 @@ extern "C" {
 
 #define FD_SETSIZE 1024
 
+typedef unsigned long fd_mask;
+
 typedef struct
 {
        unsigned long fds_bits[FD_SETSIZE / 8 / sizeof(long)];
 } 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 *);