diff options
| author | levitte <levitte> | 2001-02-19 16:01:52 +0000 |
|---|---|---|
| committer | levitte <levitte> | 2001-02-19 16:01:52 +0000 |
| commit | b27f02d7f2080104350b45fd295bbbbea18c0125 (patch) | |
| tree | cdaae5f46cb592a237efa2565a21242e10fc12ce /crypto/pkcs7/pkcs7.h | |
| parent | e86dea9f859b4c48da110ed94cbfec794ac7f910 (diff) | |
| download | openssl-b27f02d7f2080104350b45fd295bbbbea18c0125.tar.gz | |
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/pkcs7/pkcs7.h')
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 4852c59da..bc1617493 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -61,6 +61,7 @@ #include <openssl/bio.h> #include <openssl/x509.h> +#include <openssl/e_os2.h> #include <openssl/symhacks.h> @@ -68,7 +69,7 @@ extern "C" { #endif -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 /* Under Win32 thes are defined in wincrypt.h */ #undef PKCS7_ISSUER_AND_SERIAL #undef PKCS7_SIGNER_INFO @@ -276,7 +277,7 @@ DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL) #ifndef SSLEAY_MACROS int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,const EVP_MD *type, unsigned char *md,unsigned int *len); -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7); int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7); #endif |