summaryrefslogtreecommitdiffstats
path: root/apps/s_socket.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2009-08-26 11:21:50 +0000
committerRichard Levitte <levitte@openssl.org>2009-08-26 11:21:50 +0000
commit82f35daaaf64ac09d0e41fc5642986c5878f15a1 (patch)
treea0e57821ef872025da9165bae7813da68dd3e313 /apps/s_socket.c
parentb529bba4bf23aa7cf6500a4b42befc3ad1fd7551 (diff)
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...
Diffstat (limited to 'apps/s_socket.c')
-rw-r--r--apps/s_socket.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/s_socket.c b/apps/s_socket.c
index eaffc6714f..6b8713de60 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)