diff options
| author | Niall Douglas <s_github@nedprod.com> | 2022-08-03 23:07:53 +0300 |
|---|---|---|
| committer | Niall Douglas <s_github@nedprod.com> | 2022-08-03 23:07:53 +0300 |
| commit | 2eda115305c609be16dcf9e4def8cafcf3167f4a (patch) | |
| tree | 673058c686e9decc994f6395ed4a680b060f0497 | |
| parent | b1825a233a840318abc5259c6f78ac41b84fc1f6 (diff) | |
Fix corner case build failure on Windows due to including Windows headers after OpenSSL headers.
| -rw-r--r-- | include/llfio/v2.0/detail/impl/tls_socket_sources/openssl.ipp | 11 |
1 files 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 |