From cfd63f75cf5fe2312ebf5af93f524ba8763ae717 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sat, 29 Aug 2020 14:42:32 +0000
Subject: [PATCH] Fix compilation on Windows

FossilOrigin-Name: 5492e91aadc0860715114eed607b75d7d700d5f01997ccb299514b790a861d25
---
 src/X509Certificate.m | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/X509Certificate.m b/src/X509Certificate.m
index fdd72bf..170cbe1 100644
--- a/src/X509Certificate.m
+++ b/src/X509Certificate.m
@@ -21,18 +21,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__clang__)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdocumentation"
-#endif
-
-#include <openssl/crypto.h>
-#include <openssl/x509v3.h>
-
-#if defined(__clang__)
-# pragma clang diagnostic pop
-#endif
-
 #import "X509Certificate.h"
 
 #import <ObjFW/OFArray.h>
@@ -47,6 +35,23 @@
 
 #import <ObjFW/macros.h>
 
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wdocumentation"
+#endif
+
+#ifdef X509_NAME
+/* wincrypt.h has a conflicting define. */
+# undef X509_NAME
+#endif
+
+#include <openssl/crypto.h>
+#include <openssl/x509v3.h>
+
+#if defined(__clang__)
+# pragma clang diagnostic pop
+#endif
+
 OF_ASSUME_NONNULL_BEGIN
 
 @interface X509Certificate ()