Avoid warnings for no-engine and PEDANTIC

[oweals/openssl.git] / apps / s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 77908b638019df0cf0bbc92f266bd3a5e2cb00d0..a88de6c8c85c8cafca7d1e1561251916896f5815 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,13 +62,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#ifdef FLAT_INC
-#include "e_os.h"
-#else
-#include "../e_os.h"
-#endif
-
-#ifndef OPENSSL_NO_SOCK
+#include <openssl/e_os2.h>
 
 /* With IPv6, it looks like Digital has mixed up the proper order of
    recursive header file inclusion, resulting in the compiler complaining
@@ -559,5 +553,3 @@ static struct hostent *GetHostByName(char *name)
                return(ret);
                }
        }
-
-#endif