diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-20 15:07:32 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-10 10:56:23 +0100 |
commit | ffbc5b577d6283429c2348b23bca5eac46c80854 (patch) | |
tree | 31e5fc0c3e822e206db2ddf331bdf796db058cc9 /e_os.h | |
parent | 6a7de8e0942df50899fe74649731417a76860152 (diff) | |
download | openssl-ffbc5b577d6283429c2348b23bca5eac46c80854.tar.gz |
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.
This is a fixed version of what was originally commit 963bb62195 and
subsequently reverted in commit 37b1f8bd62. Somewhere along the way, the
Windows/DOS ifdef actually got removed, leaving it just broken. It should
have been turned into an #elif, not removed.
This one correctly changes the logic from
# if WINDOWS|DOS
# if OPENSSL_NO_SOCK
... no-sock ...
# elif !DJGPP
... native windows ...
to
# if OPENSSL_NO_SOCK
... no-sock ...
# elif WINDOWS|DOS
# if !DJGPP
... native windows ...
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'e_os.h')
-rw-r--r-- | e_os.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -448,11 +448,10 @@ extern int kbhit(void); # endif # ifdef USE_SOCKETS -# if defined(WINDOWS) || defined(MSDOS) +# ifdef OPENSSL_NO_SOCK +# elif defined(WINDOWS) || defined(MSDOS) /* windows world */ - -# ifdef OPENSSL_NO_SOCK -# elif !defined(__DJGPP__) +# if !defined(__DJGPP__) # if defined(_WIN32_WCE) && _WIN32_WCE<410 # define getservbyname _masked_declaration_getservbyname # endif |