changeset 14010:fd62a5de1a49

sys_select: Remove unneeded include. * lib/sys_select.in.h: Don't include <sys/socket.h> on platforms that have <sys/select.h>.
author Bruno Haible <bruno@clisp.org>
date Fri, 24 Dec 2010 16:21:59 +0100
parents 872b2da234a3
children 68009ff4e161
files ChangeLog lib/sys_select.in.h
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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