diff nt/inc/sys/socket.h @ 239:41f2f0e326e9 r20-5b18

Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 7d55a9ba150c
children c42ec1d1cded
line wrap: on
line diff
--- a/nt/inc/sys/socket.h	Mon Aug 13 10:15:04 2007 +0200
+++ b/nt/inc/sys/socket.h	Mon Aug 13 10:15:48 2007 +0200
@@ -14,6 +14,7 @@
 #define MUST_REDEF_SELECT
 #endif
 
+#if 0 /* What's wrong with winsock.h version ? - kkm */
 /* avoid clashing with our version of FD_SET if already defined */
 #ifdef FD_SET
 #undef FD_SET
@@ -24,6 +25,7 @@
 
 /* allow us to provide our own version of fd_set */
 #define fd_set ws_fd_set
+#endif /* 0 */
 
 /* avoid duplicate definition of timeval */
 #ifdef HAVE_TIMEVAL
@@ -38,6 +40,7 @@
 #undef MUST_REDEF_SELECT
 #endif
 
+#if 0 /* What's wrong with winsock.h version ? - kkm */
 /* revert to our version of FD_SET */
 #undef FD_SET
 #undef FD_CLR
@@ -45,6 +48,7 @@
 #undef FD_ZERO
 #undef fd_set
 #include "nt.h"
+#endif /* 0 */
 
 #ifdef HAVE_TIMEVAL
 #undef timeval