From 2eda115305c609be16dcf9e4def8cafcf3167f4a Mon Sep 17 00:00:00 2001
From: Niall Douglas <s_github@nedprod.com>
Date: Wed, 3 Aug 2022 21:07:53 +0100
Subject: Fix corner case build failure on Windows due to including Windows
 headers after OpenSSL headers.

---
 include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp b/include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp
index 03963aa8..e1673e67 100644
--- a/include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp
+++ b/include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp
@@ -26,11 +26,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #define LLFIO_OPENSSL_ENABLE_DEBUG_PRINTING 0
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
-
 #if LLFIO_OPENSSL_ENABLE_DEBUG_PRINTING
 #include <iostream>
 #endif
@@ -40,6 +35,12 @@ Distributed under the Boost Software License, Version 1.0.
 #pragma comment(lib, "cryptui.lib")
 #endif
 
+// Must come AFTER the Windows include, else there is a macro collision with X509_NAME
+#include <openssl/crypto.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <openssl/x509.h>
+
 LLFIO_V2_NAMESPACE_BEGIN
 
 namespace detail
-- 
cgit v1.2.3