From f96d1af449bcbe01efa3c1eb42712e10544b8811 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 23 Jul 2003 00:10:43 +0000 Subject: [PATCH] Avoid clashes with Win32 names in WinCrypt.h --- crypto/ossl_typ.h | 1 + crypto/x509/x509.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- 2.25.1