diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2003-07-23 00:10:43 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2003-07-23 00:10:43 +0000 |
| commit | f96d1af449bcbe01efa3c1eb42712e10544b8811 (patch) | |
| tree | c3f6fccf3e42052eca32f825a799d06b6efd4808 | |
| parent | 968766cad84d15d556d9b8f7ab3c927df700c378 (diff) | |
Avoid clashes with Win32 names in WinCrypt.h
| -rw-r--r-- | crypto/ossl_typ.h | 1 | ||||
| -rw-r--r-- | crypto/x509/x509.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h index b50e9ae256..46200a80b1 100644 --- a/crypto/ossl_typ.h +++ b/crypto/ossl_typ.h @@ -97,6 +97,7 @@ typedef int ASN1_NULL; #ifdef OPENSSL_SYS_WIN32 #undef X509_NAME +#undef X509_CERT_PAIR #undef PKCS7_ISSUER_AND_SERIAL #endif diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 049308ba80..e7706ce9f9 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -112,8 +112,9 @@ extern "C" { #endif #ifdef OPENSSL_SYS_WIN32 -/* Under Win32 this is defined in wincrypt.h */ +/* Under Win32 these are defined in wincrypt.h */ #undef X509_NAME +#undef X509_CERT_PAIR #endif #define X509_FILETYPE_PEM 1 |