Avoid clashes with Win32 names in WinCrypt.h

f96d1af4 · Dr. Stephen Henson · 968766ca · f96d1af4 · f96d1af4
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

crypto/ossl_typ.h crypto/ossl_typ.h +1 -0

crypto/x509/x509.h crypto/x509/x509.h +2 -1

未找到文件。
--- 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


--- 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