Commit d610d27f authored by Richard Levitte's avatar Richard Levitte
Browse files

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 *);
parent 96b35c9e

apps/apps.c

+4 −3
Original line number Diff line number Diff line
@@ -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

apps/ca.c

+2 −1
Original line number Diff line number Diff line
@@ -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