generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
David Woodhouse
2016-02-20 15:07:32 +00:00
committed by Richard Levitte
parent 6a7de8e094
commit ffbc5b577d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e_os.h
View File

@@ -448,11 +448,10 @@ extern int kbhit(void);
# endif # endif
# ifdef USE_SOCKETS # ifdef USE_SOCKETS
# if defined(WINDOWS) || defined(MSDOS)
/* windows world */
# ifdef OPENSSL_NO_SOCK # ifdef OPENSSL_NO_SOCK
# elif !defined(__DJGPP__) # elif defined(WINDOWS) || defined(MSDOS)
/* windows world */
# if !defined(__DJGPP__)
# if defined(_WIN32_WCE) && _WIN32_WCE<410 # if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname # define getservbyname _masked_declaration_getservbyname
# endif # endif