From a626788c0796a0d7cd656847a99c676fa71617f6 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 6 Feb 2014 16:50:37 +0000
Subject: [PATCH] Reorder header files to include <winsock2.h> before
 <windows.h>

OpenSSL headers include <windows.h>, it seems, so we need to include
<winsock2.h> before any of those.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 openconnect-internal.h | 24 ++++++++++++------------
 openssl.c              |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/openconnect-internal.h b/openconnect-internal.h
index db568eb2..f885051f 100644
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -29,6 +29,18 @@
 
 #define __OPENCONNECT_PRIVATE__
 
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <fcntl.h>
+#endif
+
 #include "openconnect.h"
 
 #if defined(OPENCONNECT_OPENSSL) || defined(DTLS_OPENSSL)
@@ -58,18 +70,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#endif
-
 #ifdef LIBPROXY_HDR
 #include LIBPROXY_HDR
 #endif
diff --git a/openssl.c b/openssl.c
index 01378b65..5f23c088 100644
--- a/openssl.c
+++ b/openssl.c
@@ -27,6 +27,8 @@
 #include <sys/types.h>
 #include <ctype.h>
 
+#include "openconnect-internal.h"
+
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
@@ -37,7 +39,6 @@
 #include <openssl/x509.h>
 #include <openssl/bio.h>
 
-#include "openconnect-internal.h"
 
 int openconnect_sha1(unsigned char *result, void *data, int len)
 {