From: Rich Salz <rsalz@openssl.org>
Date: Mon, 7 Mar 2016 20:32:18 +0000 (-0500)
Subject: Revert "Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms"
X-Git-Tag: OpenSSL_1_1_0-pre4~295
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=37b1f8bd6260ab7d07dcc5c16f2ed88941278e82;p=oweals%2Fopenssl.git

Revert "Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms"

This reverts commit 963bb62195109fb863dc4d88c7470ce7f9af25ac.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/e_os.h b/e_os.h
index 870c7a7e22..41ab7bb8d1 100644
--- a/e_os.h
+++ b/e_os.h
@@ -460,7 +460,10 @@ extern int kbhit(void);
 # endif
 
 # ifdef USE_SOCKETS
-#  ifdef OPENSSL_NO_SOCK
+#  if defined(WINDOWS) || defined(MSDOS)
+      /* windows world */
+
+#   ifdef OPENSSL_NO_SOCK
 #    define OpenSSL_Write(a,b,c)       (-1)
 #    define OpenSSL_Read(a,b,c)        (-1)
 #   elif !defined(__DJGPP__)