From 65cab52a5cc383cd206215632503f6cefefb4c40 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Sat, 16 Sep 2000 20:46:16 +0000 Subject: [PATCH] Adjusted to allow MFC compilation; prevent definition of struct fd_set which conflicts with the fd_set typedef. --- include/winsock.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index f6b86bac7b2..60d04ea3d92 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef HAVE_IPX_GNU # include @@ -91,12 +92,14 @@ typedef struct SOCKET16 fd_array[FD_SETSIZE]; /* an array of SOCKETs */ } ws_fd_set16; -typedef struct + +typedef struct ws_fd_set32_struct { UINT fd_count; /* how many are SET? */ SOCKET fd_array[FD_SETSIZE]; /* an array of SOCKETs */ } ws_fd_set32; + /* ws_fd_set operations */ INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * ); @@ -499,7 +502,7 @@ typedef struct sockaddr SOCKADDR, *PSOCKADDR, *LPSOCKADDR; typedef struct sockaddr_in SOCKADDR_IN, *PSOCKADDR_IN, *LPSOCKADDR_IN; typedef struct linger LINGER, *PLINGER, *LPLINGER; typedef struct in_addr IN_ADDR, *PIN_ADDR, *LPIN_ADDR; -typedef struct fd_set FD_SET, *PFD_SET, *LPFD_SET; +typedef struct ws_fd_set32_struct FD_SET, *PFD_SET, *LPFD_SET; typedef struct hostent HOSTENT, *PHOSTENT, *LPHOSTENT; typedef struct servent SERVENT, *PSERVENT, *LPSERVENT; typedef struct protoent PROTOENT, *PPROTOENT, *LPPROTOENT;