diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-08 09:18:45 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-08 09:18:45 -0400 |
| commit | 87a76094d85b133e829366a2f8de96462a3037ec (patch) | |
| tree | c1e8bf4a645451b928b72c461e3fd06741a1a670 /src | |
| parent | b6e1f6f23f02dd9534688c5ca88b511894b90faa (diff) | |
| parent | b4e7de608c868a0c193eac1a74fbd738da9d6aa4 (diff) | |
| download | cryptography-87a76094d85b133e829366a2f8de96462a3037ec.tar.gz cryptography-87a76094d85b133e829366a2f8de96462a3037ec.tar.bz2 cryptography-87a76094d85b133e829366a2f8de96462a3037ec.zip | |
Merge pull request #2775 from alex/dont-silence
Removed code to silence OpenSSL deprecation warnings on OS X
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index ba6e17b3..47fe7fd1 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -42,21 +42,6 @@ _PRE_INCLUDE = """ #if defined(OPENSSL_SYS_WINDOWS) #include <windows.h> #endif -#ifdef __APPLE__ -#include <AvailabilityMacros.h> -#define __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ - DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#endif -""" - -_POST_INCLUDE = """ -#ifdef __APPLE__ -#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER \ - __ORIG_DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#endif """ @@ -98,7 +83,6 @@ ffi = build_ffi_for_binding( "callbacks", ], pre_include=_PRE_INCLUDE, - post_include=_POST_INCLUDE, libraries=_get_openssl_libraries(sys.platform), extra_link_args=extra_link_args(compiler_type()), ) |