From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 28 May 2011 03:19:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=942e22681f836562b3a7ab58e72d7e50b20670da;p=libevent

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

Conflicts:
	evthread_win32.c
	listener.c
---

942e22681f836562b3a7ab58e72d7e50b20670da
diff --cc event_iocp.c
index fbeda703,75fe4627..26ad64f2
--- a/event_iocp.c
+++ b/event_iocp.c
@@@ -23,8 -23,11 +23,12 @@@
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 +#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>
diff --cc evthread_win32.c
index 7bb97bf9,18dca6d4..2dcd70c2
--- a/evthread_win32.c
+++ b/evthread_win32.c
@@@ -24,9 -24,12 +24,13 @@@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  #include "event2/event-config.h"
 +#include "evconfig-private.h"
  
 -#ifdef WIN32
 +#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>
diff --cc listener.c
index aaceaae7,5db2cb73..7f803382
--- a/listener.c
+++ b/listener.c
@@@ -24,12 -24,15 +24,16 @@@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 -#include <sys/types.h>
 -
  #include "event2/event-config.h"
 +#include "evconfig-private.h"
 +
 +#include <sys/types.h>
  
 -#ifdef WIN32
 +#ifdef _WIN32
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
  #include <winsock2.h>
  #include <ws2tcpip.h>
  #include <mswsock.h>