From 1e88d741f6e15d9170466a08dfe85f28b12c7623 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 28 Mar 2016 22:00:00 -0400
Subject: fix libressl breakage reported in #2858

---
 src/_cffi_src/build_openssl.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/_cffi_src/build_openssl.py')

diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
index 2ff28d75..3f925290 100644
--- a/src/_cffi_src/build_openssl.py
+++ b/src/_cffi_src/build_openssl.py
@@ -38,8 +38,15 @@ def _osx_libraries(build_static):
 
 
 _PRE_INCLUDE = """
+#include <openssl/opensslv.h>
+/*
+    LibreSSL removed e_os2.h from the public headers so we'll only include it
+    if we're using vanilla OpenSSL.
+*/
+#if !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/e_os2.h>
-#if defined(OPENSSL_SYS_WINDOWS)
+#endif
+#if defined(OPENSSL_SYS_WINDOWS) || defined(_WIN32)
 #include <windows.h>
 #endif
 """
-- 
cgit v1.2.3


From 2e10ea4650c3c9ff0ce6881083c84945326122c8 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 28 Mar 2016 22:13:24 -0400
Subject: simplify the macro def check

---
 src/_cffi_src/build_openssl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/_cffi_src/build_openssl.py')

diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
index 3f925290..14ba5b35 100644
--- a/src/_cffi_src/build_openssl.py
+++ b/src/_cffi_src/build_openssl.py
@@ -46,7 +46,7 @@ _PRE_INCLUDE = """
 #if !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/e_os2.h>
 #endif
-#if defined(OPENSSL_SYS_WINDOWS) || defined(_WIN32)
+#if defined(_WIN32)
 #include <windows.h>
 #endif
 """
-- 
cgit v1.2.3