summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2016-02-20 16:07:32 +0100
committerRich Salz <rsalz@openssl.org>2016-03-07 20:51:08 +0100
commit963bb62195109fb863dc4d88c7470ce7f9af25ac (patch)
treeae78a2ff9934ca832ef454771d6de6928c5f3a38
parentISSUE 43: Add BIO_sock_shutdown (diff)
downloadopenssl-963bb62195109fb863dc4d88c7470ce7f9af25ac.tar.xz
openssl-963bb62195109fb863dc4d88c7470ce7f9af25ac.zip
Allow OPENSSL_NO_SOCK in e_os.h even for non-Windows/DOS platforms
UEFI needs this too. Don't keep it only in the Windows/DOS ifdef block. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--e_os.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/e_os.h b/e_os.h
index 41ab7bb8d1..870c7a7e22 100644
--- a/e_os.h
+++ b/e_os.h
@@ -460,10 +460,7 @@ extern int kbhit(void);
# endif
# ifdef USE_SOCKETS
-# if defined(WINDOWS) || defined(MSDOS)
- /* windows world */
-
-# ifdef OPENSSL_NO_SOCK
+# ifdef OPENSSL_NO_SOCK
# define OpenSSL_Write(a,b,c) (-1)
# define OpenSSL_Read(a,b,c) (-1)
# elif !defined(__DJGPP__)