# HG changeset patch # User Andrew Innes # Date 966981235 0 # Node ID 65f455b1ab20421711c5835fa5409f8461b8c9c8 # Parent 69b7e5c8da03c530c09a550b00d9a32d7bbb5487 (_WINSOCK_H): Undefine if defined. (fd_set): Define to new name, after including winsock.h, so we can provide our own implementation. diff -r 69b7e5c8da03 -r 65f455b1ab20 nt/inc/sys/socket.h --- a/nt/inc/sys/socket.h Tue Aug 22 21:53:28 2000 +0000 +++ b/nt/inc/sys/socket.h Tue Aug 22 21:53:55 2000 +0000 @@ -7,6 +7,9 @@ #ifdef _WINSOCKAPI_ #undef _WINSOCKAPI_ #endif +#ifdef _WINSOCK_H +#undef _WINSOCK_H +#endif /* avoid confusion with our version of select */ #ifdef select @@ -22,9 +25,6 @@ #undef FD_ZERO #endif -/* allow us to provide our own version of fd_set */ -#define fd_set ws_fd_set - /* avoid duplicate definition of timeval */ #ifdef HAVE_TIMEVAL #define timeval ws_timeval @@ -43,7 +43,9 @@ #undef FD_CLR #undef FD_ISSET #undef FD_ZERO -#undef fd_set + +/* allow us to provide our own version of fd_set */ +#define fd_set ws_fd_set #include "w32.h" #ifdef HAVE_TIMEVAL