From: Richard Levitte <levitte@openssl.org>
Date: Wed, 26 Aug 2009 11:21:57 +0000 (+0000)
Subject: Moving up the inclusion of e_os.h was a bad idea.
X-Git-Tag: OpenSSL_0_9_8m-beta1~127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f78bcb89454fcbce8574d4715afd113601e871b2;p=oweals%2Fopenssl.git

Moving up the inclusion of e_os.h was a bad idea.
Put it back where it was and place an inclusion of e_os2.h to get platform
macros defined...
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 02bfb42f08..cf82358535 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -63,9 +63,9 @@
 #include <signal.h>
 
 #ifdef FLAT_INC
-#include "e_os.h"
+#include "e_os2.h"
 #else
-#include "../e_os.h"
+#include "../e_os2.h"
 #endif
 
 /* With IPv6, it looks like Digital has mixed up the proper order of
@@ -85,6 +85,12 @@ 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)