0001-openssl-Fix-the-Windows-build.patch

From 1be00a74aa639f520c29d69d5f1cca09039b0a2e Mon Sep 17 00:00:00 2001
From: Bert Belder <[email protected]>
Date: Wed, 11 Apr 2012 02:47:24 +0200
Subject: [PATCH 1/1] openssl: Fix the Windows build

---
 deps/openssl/openssl.gyp           |    7 +++++--
 deps/openssl/openssl/e_os.h        |    2 +-
 deps/openssl/openssl/ssl/dtls1.h   |    2 +-
 deps/openssl/openssl/ssl/ssltest.c |    2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 4c28799..d8e798f 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -11,7 +11,6 @@
         'L_ENDIAN',
         'OPENSSL_THREADS',
         'PURIFY',
-        'TERMIOS',
         '_REENTRANT',
         # We do not use TLS over UDP on Chromium so far.
         'OPENSSL_NO_DTLS1',
@@ -628,7 +627,10 @@
       ],
       'conditions': [
         ['OS=="win"', {
-            # <fill in blanks>
+          'defines': [
+            'MK1MF_BUILD',
+            'WIN32_LEAN_AND_MEAN',
+          ]
         }, {
           'defines': [
             # ENGINESDIR must be defined if OPENSSLDIR is.
@@ -636,6 +638,7 @@
             # Set to ubuntu default path for convenience. If necessary, override
             # this at runtime with the SSL_CERT_DIR environment variable.
             'OPENSSLDIR="/etc/ssl"',
+            'TERMIOS',
           ],
         }],
         ['OS=="solaris"', {
diff --git a/deps/openssl/openssl/e_os.h b/deps/openssl/openssl/e_os.h
index 5ceeeeb..04aaf8e 100644
--- a/deps/openssl/openssl/e_os.h
+++ b/deps/openssl/openssl/e_os.h
@@ -498,7 +498,7 @@ static unsigned int _strlen31(const char *str)
 #      endif
 #      if !defined(IPPROTO_IP)
          /* winsock[2].h was included already? */
-#        include <winsock.h>
+#        include <winsock2.h>
 #      endif
 #      ifdef getservbyname
 #        undef getservbyname
diff --git a/deps/openssl/openssl/ssl/dtls1.h b/deps/openssl/openssl/ssl/dtls1.h
index 2900d1d..cbe9a13 100644
--- a/deps/openssl/openssl/ssl/dtls1.h
+++ b/deps/openssl/openssl/ssl/dtls1.h
@@ -68,7 +68,7 @@
 #endif
 #ifdef OPENSSL_SYS_WIN32
 /* Needed for struct timeval */
-#include <winsock.h>
+#include <winsock2.h>
 #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
 #include <sys/timeval.h>
 #else
diff --git a/deps/openssl/openssl/ssl/ssltest.c b/deps/openssl/openssl/ssl/ssltest.c
index f6a2c79..25761d8 100644
--- a/deps/openssl/openssl/ssl/ssltest.c
+++ b/deps/openssl/openssl/ssl/ssltest.c
@@ -190,7 +190,7 @@
 				  */
 
 #ifdef OPENSSL_SYS_WINDOWS
-#include <winsock.h>
+#include <winsock2.h>
 #else
 #include OPENSSL_UNISTD
 #endif
-- 
1.7.9.msysgit.0