sys_select: Remove unneeded include.

* lib/sys_select.in.h: Don't include <sys/socket.h> on platforms that
have <sys/select.h>.

diff --git a/ChangeLog b/ChangeLog
index 9e4c4e42ce60a3d2d640c92ed08c25d6ce6a1352..edab313c04d59d0c9ad02392a28167470064d1af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-24  Bruno Haible  <bruno@clisp.org>
+
+       sys_select: Remove unneeded include.
+       * lib/sys_select.in.h: Don't include <sys/socket.h> on platforms that
+       have <sys/select.h>.
+
 2010-12-24  Bruno Haible  <bruno@clisp.org>
 
        gethostname: Provide a fallback for HOST_NAME_MAX.

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 4414dfeba95cdeb6a2d0144de8e35927a8a7aa86..baaf51057790cc02e79342535f960846eb07c954 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -65,8 +65,11 @@
 #ifndef _GL_SYS_SELECT_H
 #define _GL_SYS_SELECT_H
 
-#if !@HAVE_SYS_SELECT_H@ || @REPLACE_SELECT@
+#if !@HAVE_SYS_SELECT_H@
 /* A platform that lacks <sys/select.h>.  */
+/* On native Windows platforms:
+   Get the 'fd_set' type.  Also, gnulib's <sys/socket.h> redefines select
+   so as to hide the declaration from <winsock2.h>.  */
 # include <sys/socket.h>
 #endif