From: Richard Levitte <levitte@openssl.org>
Date: Tue, 25 Aug 2009 07:24:00 +0000 (+0000)
Subject: Move up the inclusion of e_os.h so OPENSSL_SYS_VMS_DECC has a chance
X-Git-Tag: OpenSSL_0_9_8m-beta1~131
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=df51d79ec47ec62b46f03b9775dd9902752a5aee

Move up the inclusion of e_os.h so OPENSSL_SYS_VMS_DECC has a chance
to be properly defined.
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 4a922e16a0..02bfb42f08 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,6 +62,12 @@
 #include <errno.h>
 #include <signal.h>
 
+#ifdef FLAT_INC
+#include "e_os.h"
+#else
+#include "../e_os.h"
+#endif
+
 /* 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,12 +85,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
 
 #if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)