From: Richard Levitte <levitte@openssl.org>
Date: Thu, 24 Oct 2002 09:41:45 +0000 (+0000)
Subject: On certain platforms, we redefine certain symbols using macros in
X-Git-Tag: OpenSSL_0_9_7-beta4~102
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4f99ab58f7690128a503aec379153417c6d13d52;p=oweals%2Fopenssl.git

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 5863b33850..b2a28c9b4d 100644
--- 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 32fcae833b..7836074bd3 100644
--- 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