From c807358ff5e7fdac1f697177c9d87bf634df6d48 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 May 2008 03:59:57 +0000
Subject: [PATCH]  r19666@catbus:  nickm | 2008-05-08 23:49:18 -0400  Always
 include winsock2.h before windows.h.  Apparently some SDKs need this.

svn:r802
---
 ChangeLog | 1 +
 evhttp.h  | 2 +-
 evrpc.c   | 2 +-
 evutil.c  | 2 +-
 signal.c  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86a24d1a..be5ebc09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/evhttp.h b/evhttp.h
index bc1244a8..ebe5619a 100644
--- a/evhttp.h
+++ b/evhttp.h
@@ -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
 
diff --git a/evrpc.c b/evrpc.c
index 11c7b10c..32fbfa27 100644
--- a/evrpc.c
+++ b/evrpc.c
@@ -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
 
diff --git a/evutil.c b/evutil.c
index 40da826c..e6bf625e 100644
--- a/evutil.c
+++ b/evutil.c
@@ -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>
diff --git a/signal.c b/signal.c
index 964ae37f..3be350ce 100644
--- a/signal.c
+++ b/signal.c
@@ -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>