On certain platforms, we redefine certain symbols using macros in

apps.h.  For those, it's better to include apps.h after the system
headers where those symbols may be defined, since there's otherwise a
chance that the C compiler will barf when it sees something that looks
like this after expansion:

int VMS_strcasecmp((str1),(str2))(const char *, const char *);

diff --git a/apps/apps.c b/apps/apps.c
index 5863b33850ea9048351e93d2925e97f1d514823c..b2a28c9b4d23942b79f4c230a154e556a0006532 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -114,9 +114,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#define NON_MAIN
-#include "apps.h"
-#undef NON_MAIN
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@@ -136,6 +133,10 @@
 #  endif /* NO_STRINGS_H */
 #endif
 
+#define NON_MAIN
+#include "apps.h"
+#undef NON_MAIN
+
 #ifdef OPENSSL_SYS_WINDOWS
 #  include "bss_file.c"
 #endif

diff --git a/apps/ca.c b/apps/ca.c
index 32fcae833b4c10197c95dd14723c861e9d53a400..7836074bd389494196f46d10a165d251dcaf4949 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -64,7 +64,6 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "apps.h"
 #include <openssl/conf.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
@@ -99,6 +98,8 @@
 #  endif
 #endif
 
+#include "apps.h"
+
 #ifndef W_OK
 #  define F_OK 0
 #  define X_OK 1