From: Robin Lee <robinlee.sysu@gmail.com>
Date: Thu, 4 Sep 2014 16:36:41 +0000 (-0400)
Subject: RT3031: Need to #undef some names for win32
X-Git-Tag: OpenSSL_1_0_2-beta3~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=240635c0b275da3d3f8adf4aa94b428ee33530b8;p=oweals%2Fopenssl.git

RT3031: Need to #undef some names for win32

Copy the ifdef/undef stanza from x509.h to x509v3.h

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 83e4e03eeb22d2fbaec516a466330f2ccab22864)
---

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;