* include/sys/select.h: Guard definitions with __USE_W32_SOCKETS as

	the accompanying fd_set definitions in newlib's sys/types.h.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index cfed63eaff615d6d0a124efee7d89fb72351336b..74ca188519d89e3eaa44d840349817a25a3de0fe 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-08  Corinna Vinschen  <corinna@vinschen.de>
+
+       * include/sys/select.h: Guard definitions with __USE_W32_SOCKETS as
+       the accompanying fd_set definitions in newlib's sys/types.h.
+
 2009-05-06  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * fhandler_console.cc (fhandler_console::ioctl): Properly treat

diff --git a/winsup/cygwin/include/sys/select.h b/winsup/cygwin/include/sys/select.h
index b0f328327469a128ef19caef1e0a51a9157205d0..45aef1e18f344b8f2812132cfeabe1f5fe4619f1 100644 (file)
--- a/winsup/cygwin/include/sys/select.h
+++ b/winsup/cygwin/include/sys/select.h
@@ -1,5 +1,5 @@
 /* select.h
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2009 Red Hat, Inc.
 
    Written by Geoffrey Noer <noer@cygnus.com>
 
@@ -12,7 +12,7 @@ details. */
 #ifndef _SYS_SELECT_H
 #define _SYS_SELECT_H
 
-#if !defined (_POSIX_SOURCE) && !defined (__INSIDE_CYGWIN_NET__)
+#if !defined (_POSIX_SOURCE) && !defined (__INSIDE_CYGWIN_NET__) && !defined (__USE_W32_SOCKETS)
 
 #include <sys/cdefs.h>