diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-29 22:25:32 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-29 22:25:32 -0400 |
| commit | 15ab4fc371bc9f94868f430eec9d55bca05e147a (patch) | |
| tree | b2ff7c8d004947837fca5d4f7677bc7e3a026a45 | |
| parent | 22af62432d280017b00432de3e82aa71b64d12f9 (diff) | |
| parent | 2e10ea4650c3c9ff0ce6881083c84945326122c8 (diff) | |
| download | cryptography-15ab4fc371bc9f94868f430eec9d55bca05e147a.tar.gz cryptography-15ab4fc371bc9f94868f430eec9d55bca05e147a.tar.bz2 cryptography-15ab4fc371bc9f94868f430eec9d55bca05e147a.zip | |
Merge pull request #2861 from reaperhulk/fix-libressl
fix libressl breakage reported in #2858
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index 2ff28d75..14ba5b35 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(_WIN32) #include <windows.h> #endif """ |