* include/windows.h (#include <winsock.h>): Include <winsock2.h>

instead if (_WIN32_WINNT >= 0x0400)&&(__W32API_MAJOR_VERSION > 0).
This commit is contained in:
Earnie Boyd 2001-04-12 01:11:41 +00:00
parent e1cc9ad77c
commit eae0943a1f
2 changed files with 14 additions and 0 deletions

View File

@ -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).

View File

@ -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 */