Commit ffbc5b57 authored by David Woodhouse's avatar David Woodhouse Committed by Richard Levitte
Browse files

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 963bb621 and
subsequently reverted in commit 37b1f8bd. 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: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6a7de8e0

e_os.h

+3 −4
Original line number Diff line number Diff line
@@ -448,11 +448,10 @@ extern int kbhit(void); 
# endif



# ifdef USE_SOCKETS

#  if defined(WINDOWS) || defined(MSDOS)

      /* windows world */



#  ifdef OPENSSL_NO_SOCK

#   elif !defined(__DJGPP__)

#  elif defined(WINDOWS) || defined(MSDOS)

      /* windows world */

#   if !defined(__DJGPP__)

#    if defined(_WIN32_WCE) && _WIN32_WCE<410

#     define getservbyname _masked_declaration_getservbyname

#    endif