From: Bruno Haible <bruno@clisp.org>
Date: Fri, 24 Dec 2010 15:21:59 +0000 (+0100)
Subject: sys_select: Remove unneeded include.
X-Git-Tag: v0.1~3477
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=70c8ea91010550564ae598329ab51cb2b9849011;p=gnulib.git

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 9e4c4e42c..edab313c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
 	* m4/gethostname.m4 (gl_FUNC_GETHOSTNAME): When neither HOST_NAME_MAX
 	nor MAXHOSTNAMELEN is found in the usual system headers, use 256
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 4414dfeba..baaf51057 100644
--- 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