diff options
| author | David Reid <dreid@dreid.org> | 2013-12-12 13:42:23 -0800 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-12-12 13:42:23 -0800 |
| commit | 76ec34058a30026b62cc6f16a6c172fe5011798d (patch) | |
| tree | 1c54ebceee1eae293a9f4b942bfbfe619ee7e5da | |
| parent | 2cfff24f6d59402ef3616c1e5d253e1ab1c77867 (diff) | |
| download | cryptography-76ec34058a30026b62cc6f16a6c172fe5011798d.tar.gz cryptography-76ec34058a30026b62cc6f16a6c172fe5011798d.tar.bz2 cryptography-76ec34058a30026b62cc6f16a6c172fe5011798d.zip | |
Attempt to fix nebulous indentation complaints and also re-set after the includes.
| -rw-r--r-- | cryptography/hazmat/bindings/openssl/backend.py | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/cryptography/hazmat/bindings/openssl/backend.py b/cryptography/hazmat/bindings/openssl/backend.py index d093684e..044e8cc9 100644 --- a/cryptography/hazmat/bindings/openssl/backend.py +++ b/cryptography/hazmat/bindings/openssl/backend.py @@ -112,18 +112,30 @@ class Backend(object): # int foo(int); # int foo(short); - preamble = [ -""" + pre_includes = [""" #ifdef __APPLE__ -# include <AvailabilityMacros.h> -# undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -# define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER +#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_includes = [""" +#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 +"""] lib = ffi.verify( - source="\n".join(preamble + includes + functions + customizations), + source="\n".join(pre_includes + + includes + + post_includes + + functions + + customizations), libraries=["crypto", "ssl"], ) |