From: Martin Willi <martin@revosec.ch>
Date: Fri, 25 Oct 2013 15:29:31 +0000 (+0200)
Subject: openssl: Undef OpenSSLs X509_NAME defined by <wincrypt.h>
X-Git-Tag: 5.2.0dr6~24^2~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f310a2e7538741471f708dc4d23e06d081a2165;p=thirdparty%2Fstrongswan.git

openssl: Undef OpenSSLs X509_NAME defined by <wincrypt.h>
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h
index ce2a9e1091..2db0731392 100644
--- a/src/libstrongswan/plugins/openssl/openssl_util.h
+++ b/src/libstrongswan/plugins/openssl/openssl_util.h
@@ -22,6 +22,12 @@
 #define OPENSSL_UTIL_H_
 
 #include <library.h>
+
+#ifdef X509_NAME
+/* from <wincrypt.h> */
+# undef X509_NAME
+#endif
+
 #include <openssl/bn.h>
 #include <openssl/asn1.h>