From 240635c0b275da3d3f8adf4aa94b428ee33530b8 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 4 Sep 2014 12:36:41 -0400 Subject: [PATCH] RT3031: Need to #undef some names for win32 Copy the ifdef/undef stanza from x509.h to x509v3.h Reviewed-by: Dr. Stephen Henson (cherry picked from commit 83e4e03eeb22d2fbaec516a466330f2ccab22864) --- crypto/x509v3/x509v3.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 051b250abf..6556366277 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -66,6 +66,13 @@ extern "C" { #endif +#ifdef OPENSSL_SYS_WIN32 +/* Under Win32 these are defined in wincrypt.h */ +#undef X509_NAME +#undef X509_CERT_PAIR +#undef X509_EXTENSIONS +#endif + /* Forward reference */ struct v3_ext_method; struct v3_ext_ctx; -- 2.25.1