]> Savannah Git Hosting - gnulib.git/commitdiff
sys_select: Fix compilation error on mingw.
authorBruno Haible <bruno@clisp.org>
Tue, 4 Oct 2011 00:32:48 +0000 (02:32 +0200)
committerBruno Haible <bruno@clisp.org>
Tue, 4 Oct 2011 00:32:48 +0000 (02:32 +0200)
* lib/sys_select.in.h: On native Windows, include <io.h>.

ChangeLog
lib/sys_select.in.h

index 668add3b6a338d5d5e1abd8cc9b0d70b52b16a09..3df083868cb911cc882d3fdf53a1d02268f08ba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-03  Bruno Haible  <bruno@clisp.org>
+
+       sys_select: Fix compilation error on mingw.
+       * lib/sys_select.in.h: On native Windows, include <io.h>.
+
 2011-10-03  Bruno Haible  <bruno@clisp.org>
 
        wmemset: Support for MSVC.
index 7d43c2782b3e2d59dcc88bc929c257dadc912e9f..397508aac4884696733481fa48255bc245057da9 100644 (file)
 #  include <string.h>
 # endif
 /* On native Windows platforms:
-   Get the 'fd_set' type.  */
-# if @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
-#  define _GL_INCLUDING_WINSOCK2_H
-#  include <winsock2.h>
-#  undef _GL_INCLUDING_WINSOCK2_H
+   Get the 'fd_set' type.
+   Get the close() declaration before we override it.  */
+# if @HAVE_WINSOCK2_H@
+#  if !defined _GL_INCLUDING_WINSOCK2_H
+#   define _GL_INCLUDING_WINSOCK2_H
+#   include <winsock2.h>
+#   undef _GL_INCLUDING_WINSOCK2_H
+#  endif
+#  include <io.h>
 # endif
 #endif