Avoid clashes with Win32 names in WinCrypt.h
authorDr. Stephen Henson <steve@openssl.org>
Wed, 23 Jul 2003 00:10:43 +0000 (00:10 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 23 Jul 2003 00:10:43 +0000 (00:10 +0000)
crypto/ossl_typ.h
crypto/x509/x509.h

index b50e9ae..46200a8 100644 (file)
@@ -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
 
index 049308b..e7706ce 100644 (file)
@@ -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