Avoid clashes with Win32 names in WinCrypt.h

diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index b50e9ae256e71ce979c811c428012a3fde830956..46200a80b165a5b671a0ccc337dd58cf4173a9a2 100644 (file)
--- 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
 
 #ifdef OPENSSL_SYS_WIN32
 #undef X509_NAME

+#undef X509_CERT_PAIR

 #undef PKCS7_ISSUER_AND_SERIAL
 #endif
 
 #undef PKCS7_ISSUER_AND_SERIAL
 #endif
 

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 049308ba80ee1cfb5b3f1b73321804e76f13fbc6..e7706ce9f996b3388b0212039105e27eea7ff7ce 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -112,8 +112,9 @@ extern "C" {
 #endif
 
 #ifdef OPENSSL_SYS_WIN32
 #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_NAME

+#undef X509_CERT_PAIR

 #endif
 
 #define X509_FILETYPE_PEM      1
 #endif
 
 #define X509_FILETYPE_PEM      1