X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/46abd569d545d07a05e0bdbbe16750c31dd7140e..7974c57937104b0617d93fa492d3bd323b053f20:/libguile/iselect.h

diff --git a/libguile/iselect.h b/libguile/iselect.h
index 760d959d8..945ad14af 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -3,7 +3,8 @@
 #ifndef SCM_ISELECT_H
 #define SCM_ISELECT_H
 
-/* Copyright (C) 1997,1998,2000,2001, 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,2000,2001, 2002, 2006,
+ *   2013 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -28,37 +29,16 @@
 /* Needed for FD_SET on some systems.  */
 #include <sys/types.h>
 
-#if SCM_HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-
-#if SCM_HAVE_WINSOCK2_H
-# include <winsock2.h>
-#endif
-
-#ifdef FD_SET
-
-#define SELECT_TYPE fd_set
-#define SELECT_SET_SIZE FD_SETSIZE
-
-#else /* no FD_SET */
-
-/* Define the macros to access a single-int bitmap of descriptors.  */
-#define SELECT_SET_SIZE 32
-#define SELECT_TYPE int
-#define FD_SET(n, p) (*(p) |= (1 << (n)))
-#define FD_CLR(n, p) (*(p) &= ~(1 << (n)))
-#define FD_ISSET(n, p) (*(p) & (1 << (n)))
-#define FD_ZERO(p) (*(p) = 0)
-
-#endif /* no FD_SET */
+#include <sys/select.h>
 
 SCM_API int scm_std_select (int fds,
-			    SELECT_TYPE *rfds,
-			    SELECT_TYPE *wfds,
-			    SELECT_TYPE *efds,
+			    fd_set *rfds,
+			    fd_set *wfds,
+			    fd_set *efds,
 			    struct timeval *timeout);
 
+#define SELECT_TYPE fd_set
+
 #endif  /* SCM_ISELECT_H */
 
 /*