diff options
author | Richard Levitte <levitte@openssl.org> | 2002-10-24 10:03:55 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-10-24 10:03:55 +0000 |
commit | d610d27f30c95564314b2143ff3c164624f38336 (patch) | |
tree | 89bef56fa1d4ef4bd0263e0a8d8985fe475562d6 | |
parent | 96b35c9e26c847b5f12cf243975de3ed92b50295 (diff) |
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 *);
-rw-r--r-- | apps/apps.c | 7 | ||||
-rw-r--r-- | apps/ca.c | 3 |
2 files changed, 6 insertions, 4 deletions
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 @@ -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 |