Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	evthread_win32.c
	listener.c
This commit is contained in:
Nick Mathewson 2011-05-27 23:19:11 -04:00
commit 942e22681f
3 changed files with 12 additions and 0 deletions

View File

@ -25,6 +25,10 @@
*/
#include "evconfig-private.h"
#ifndef _WIN32_WINNT
/* Minimum required for InitializeCriticalSectionAndSpinCount */
#define _WIN32_WINNT 0x0403
#endif
#include <winsock2.h>
#include <windows.h>
#include <process.h>

View File

@ -27,6 +27,10 @@
#include "evconfig-private.h"
#ifdef _WIN32
#ifndef _WIN32_WINNT
/* Minimum required for InitializeCriticalSectionAndSpinCount */
#define _WIN32_WINNT 0x0403
#endif
#include <winsock2.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

View File

@ -30,6 +30,10 @@
#include <sys/types.h>
#ifdef _WIN32
#ifndef _WIN32_WINNT
/* Minimum required for InitializeCriticalSectionAndSpinCount */
#define _WIN32_WINNT 0x0403
#endif
#include <winsock2.h>
#include <ws2tcpip.h>
#include <mswsock.h>