r19666@catbus: nickm | 2008-05-08 23:49:18 -0400

Always include winsock2.h before windows.h.  Apparently some SDKs need this.


svn:r802
This commit is contained in:
Nick Mathewson 2008-05-09 03:59:57 +00:00
parent 32143cc285
commit c807358ff5
5 changed files with 5 additions and 4 deletions

View File

@ -14,6 +14,7 @@ Changes in 1.4.4-stable:
o Expose evhttp_accept_socket() API.
o Merge windows gettimeofday() replacement into a new evutil_gettimeofday() function.
o Fix autoconf script behavior on IRIX.
o Make sure winsock2.h include always comes before windows.h include.
Changes in 1.4.3-stable:

View File

@ -35,8 +35,8 @@ extern "C" {
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winsock2.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif

View File

@ -30,8 +30,8 @@
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winsock2.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif

View File

@ -29,10 +29,10 @@
#endif
#ifdef WIN32
#include <winsock2.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#endif
#include <sys/types.h>

View File

@ -32,8 +32,8 @@
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winsock2.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#endif
#include <sys/types.h>