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 /crypto/conf/conf_lib.c | |
| 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 'crypto/conf/conf_lib.c')
| -rw-r--r-- | crypto/conf/conf_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index a071750249..48803bc186 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -98,7 +98,7 @@ LHASH *CONF_load(LHASH *conf, const char *file, long *eline) return ltmp; } -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline) { BIO *btmp; @@ -208,7 +208,7 @@ void CONF_free(LHASH *conf) NCONF_free_data(&ctmp); } -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API int CONF_dump_fp(LHASH *conf, FILE *out) { BIO *btmp; @@ -284,7 +284,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline) return conf->meth->load(conf, file, eline); } -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API int NCONF_load_fp(CONF *conf, FILE *fp,long *eline) { BIO *btmp; @@ -371,7 +371,7 @@ int NCONF_get_number_e(CONF *conf,char *group,char *name,long *result) return 1; } -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API int NCONF_dump_fp(CONF *conf, FILE *out) { BIO *btmp; |