diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-05-21 12:14:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-05-21 12:14:35 +0000 |
| commit | 4b55c2a3a9590fd27f865e2325195a2e14215bce (patch) | |
| tree | cbbb1e77e1ecb5eddd72187f4a741c6d12907dd5 | |
| parent | 470df4b90563e3ef3e4fff1771f88e78b72cc760 (diff) | |
Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will
always get included with the relevant files.
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 5 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 6 | ||||
| -rw-r--r-- | e_os.h | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h index 80c725dcd5..197b257725 100644 --- a/crypto/pkcs7/pkcs7.h +++ b/crypto/pkcs7/pkcs7.h @@ -66,6 +66,11 @@ extern "C" { #include <openssl/bio.h> #include <openssl/x509.h> +#ifdef WIN32 +/* Under Win32 this is defined in wincrypt.h */ +#undef PKCS7_ISSUER_AND_SERIAL +#endif + /* Encryption_ID DES-CBC Digest_ID MD5 diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 6f8fac0c8b..de574791f7 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -86,6 +86,12 @@ extern "C" { #include <openssl/evp.h> + +#ifdef WIN32 +/* Under Win32 this is defined in wincrypt.h */ +#undef X509_NAME +#endif + #define X509_FILETYPE_PEM 1 #define X509_FILETYPE_ASN1 2 #define X509_FILETYPE_DEFAULT 3 @@ -103,9 +103,6 @@ extern "C" { #ifdef WIN32 #define get_last_sys_error() GetLastError() #define clear_sys_error() SetLastError(0) -/* These are defined in wincrypt.h and can cause problems */ -#undef X509_NAME -#undef PKCS7_SIGNER_INFO #if !defined(WINNT) #define WIN_CONSOLE_BUG #endif |