diff options
-rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/w32api/include/windows.h | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index d08ea0066..21f91bfc6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,9 @@ +2001-04-11 Danny Smith <dannysmith@users.sourceforge.net> + + * include/windows.h (#include <winsock.h>): Include <winsock2.h> + instead if (_WIN32_WINNT >= 0x0400)&&(__W32API_MAJOR_VERSION > 0). + 2001-04-11 Danny Smith <danny_r_smith_2001@yahoo.co.nz> * include/winuser.h (WM_IME_*): Remove defines (now in imm.h). diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index 62598397d..59fc63496 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -141,7 +141,16 @@ #endif #endif #if defined(__USE_W32_SOCKETS) || !(defined(__INSIDE_CYGWIN__) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_UWIN)) +#if (_WIN32_WINNT >= 0x0400) && (__W32API_MAJOR_VERSION > 0) +#include <winsock2.h> +/* + * MS likes to include mswsock.h here as well, + * but that can cause undefined symbols if + * winsock2.h is included before windows.h + */ +#else #include <winsock.h> +#endif /* (_WIN32_WINNT >= 0x0400) && (__W32API_MAJOR_VERSION > 0) */ #endif #endif /* WIN32_LEAN_AND_MEAN */ |