From: Richard Levitte <levitte@openssl.org>
Date: Tue, 20 Feb 2001 17:37:02 +0000 (+0000)
Subject: I forgot there was a reason why the inclusions and definition of u_int
X-Git-Tag: OpenSSL-engine-0_9_6a-beta1~9^5~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02cc82ff8adbb43918720796c97df36ac0579323;p=openssl

I forgot there was a reason why the inclusions and definition of u_int
was made in a certain sequence.  This change restores the earlier
"chain of command".
---

diff --git a/apps/s_socket.c b/apps/s_socket.c
index adaeef646a..bd499d020c 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,13 +62,6 @@
 #include <errno.h>
 #include <signal.h>
 
-#define USE_SOCKETS
-#define NON_MAIN
-#include "apps.h"
-#undef USE_SOCKETS
-#undef NON_MAIN
-#include "s_apps.h"
-#include <openssl/ssl.h>
 #include <openssl/e_os2.h>
 
 /* With IPv6, it looks like Digital has mixed up the proper order of
@@ -80,6 +73,14 @@
 typedef unsigned int u_int;
 #endif
 
+#define USE_SOCKETS
+#define NON_MAIN
+#include "apps.h"
+#undef USE_SOCKETS
+#undef NON_MAIN
+#include "s_apps.h"
+#include <openssl/ssl.h>
+
 static struct hostent *GetHostByName(char *name);
 #ifdef OPENSSL_SYS_WINDOWS
 static void sock_cleanup(void);