* include/windows.h (#include <winsock.h>): Include <winsock2.h>
instead if (_WIN32_WINNT >= 0x0400)&&(__W32API_MAJOR_VERSION > 0).
This commit is contained in:
parent
e1cc9ad77c
commit
eae0943a1f
|
@ -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>
|
2001-04-11 Danny Smith <danny_r_smith_2001@yahoo.co.nz>
|
||||||
|
|
||||||
* include/winuser.h (WM_IME_*): Remove defines (now in imm.h).
|
* include/winuser.h (WM_IME_*): Remove defines (now in imm.h).
|
||||||
|
|
|
@ -141,7 +141,16 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if defined(__USE_W32_SOCKETS) || !(defined(__INSIDE_CYGWIN__) || defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_UWIN))
|
#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>
|
#include <winsock.h>
|
||||||
|
#endif /* (_WIN32_WINNT >= 0x0400) && (__W32API_MAJOR_VERSION > 0) */
|
||||||
#endif
|
#endif
|
||||||
#endif /* WIN32_LEAN_AND_MEAN */
|
#endif /* WIN32_LEAN_AND_MEAN */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue