diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
| commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
| tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /apps/apps.h | |
| parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) | |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h index cd31473173..db3fe030a1 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -79,11 +79,11 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read, * (see e_os.h). The string is * destroyed! */ -#ifdef NO_STDIO +#ifdef OPENSSL_NO_STDIO BIO_METHOD *BIO_s_file(); #endif -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 #define rename(from,to) WIN32_rename((from),(to)) int WIN32_rename(char *oldname,char *newname); #endif @@ -118,7 +118,8 @@ extern BIO *bio_err; #if defined(MONOLITH) && !defined(OPENSSL_C) # define apps_startup() do_pipe_sig() #else -# if defined(MSDOS) || defined(WIN16) || defined(WIN32) +# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \ + defined(OPENSSL_SYS_WIN32) # ifdef _O_BINARY # define apps_startup() \ _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ |