From ffbc5b577d6283429c2348b23bca5eac46c80854 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 20 Feb 2016 15:07:32 +0000 Subject: [PATCH] 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 Reviewed-by: Richard Levitte --- e_os.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/e_os.h b/e_os.h index d2ae1ecde0..02c1ffd7a2 100644 --- a/e_os.h +++ b/e_os.h @@ -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 -- 2.25.1