From: Matt Caswell <matt@openssl.org>
Date: Wed, 20 Apr 2016 11:43:27 +0000 (+0100)
Subject: Include winsock2.h even if compiling no-sock
X-Git-Tag: OpenSSL_1_1_0-pre6~1104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2469e76b30d64d9374e06523f3c8a7d669986523;p=oweals%2Fopenssl.git

Include winsock2.h even if compiling no-sock

We need the struct timeval definition from winsock2.h even if we're not
going to call any socket functions.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/e_os.h b/e_os.h
index f85b754b12..eaa9396b88 100644
--- a/e_os.h
+++ b/e_os.h
@@ -223,7 +223,7 @@ extern "C" {
         */
 #    define _WIN32_WINNT 0x0501
 #   endif
-#   if !defined(OPENSSL_NO_SOCK) && (defined(_WIN32_WINNT) || defined(_WIN32_WCE))
+#   if defined(_WIN32_WINNT) || defined(_WIN32_WCE)
        /*
         * Just like defining _WIN32_WINNT including winsock2.h implies
         * certain "discipline" for maintaining [broad] binary compatibility.