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 adaeef646a9e0663d4ac594c57287d75dbdb3e57..bd499d020c5c0f6ed5f8fb462041763b49a4ac50 100644 (file)
--- 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);