From 4f310a2e7538741471f708dc4d23e06d081a2165 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Fri, 25 Oct 2013 17:29:31 +0200
Subject: openssl: Undef OpenSSLs X509_NAME defined by <wincrypt.h>

---
 src/libstrongswan/plugins/openssl/openssl_util.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/libstrongswan/plugins/openssl/openssl_util.h')

diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h
index ce2a9e109..2db073139 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>
 
-- 
cgit v1.2.3