[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  37b1f8bd6260ab7d07dcc5c16f2ed88941278e82 (commit)
      from  95e040bb2b36aeee61262cc2fdc50c57dd0b863a (commit)


- Log -----------------------------------------------------------------
commit 37b1f8bd6260ab7d07dcc5c16f2ed88941278e82
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Mar 7 15:32:18 2016 -0500

    Revert "Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms"
    
    This reverts commit 963bb62195109fb863dc4d88c7470ce7f9af25ac.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 e_os.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/e_os.h b/e_os.h
index 870c7a7..41ab7bb 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__)