Dont forget req.

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

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 9a696d5f93970a0fd03b2064eeda589c6c7fd2f2..a88de6c8c85c8cafca7d1e1561251916896f5815 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,6 +62,8 @@
 #include <errno.h>
 #include <signal.h>
 
+#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
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
@@ -79,14 +81,6 @@ typedef unsigned int u_int;
 #include "s_apps.h"
 #include <openssl/ssl.h>
 
-#ifdef FLAT_INC
-#include "e_os.h"
-#else
-#include "../e_os.h"
-#endif
-
-#ifndef OPENSSL_NO_SOCK
-
 static struct hostent *GetHostByName(char *name);
 #ifdef OPENSSL_SYS_WINDOWS
 static void ssl_sock_cleanup(void);
@@ -559,5 +553,3 @@ static struct hostent *GetHostByName(char *name)
                return(ret);
                }
        }
-
-#endif