diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-17 10:06:07 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-17 10:06:07 -0400 |
| commit | 09b768ab8aa49a3e1c826b615477500390b879bb (patch) | |
| tree | 748358f3ebbfce4a8be54e9d3673aa9c5370cc6c /src | |
| parent | 27c17fb53f9095fea0c1f4582963bac693e07af3 (diff) | |
| parent | 72c7e483c3868ab0e0d9fa80b4bbba72ce8b18d7 (diff) | |
| download | cryptography-09b768ab8aa49a3e1c826b615477500390b879bb.tar.gz cryptography-09b768ab8aa49a3e1c826b615477500390b879bb.tar.bz2 cryptography-09b768ab8aa49a3e1c826b615477500390b879bb.zip | |
Merge pull request #2834 from reaperhulk/110-patch-40
OPENSSL_free is a macro in 1.1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 9357815b..b9ecd5ab 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -43,7 +43,6 @@ void CRYPTO_set_locking_callback(void(*)(int, int, const char *, int)); void (*CRYPTO_get_locking_callback(void))(int, int, const char *, int); void CRYPTO_lock(int, int, const char *, int); -void OPENSSL_free(void *); """ MACROS = """ @@ -55,6 +54,9 @@ unsigned long OpenSSL_version_num(void); const char *OpenSSL_version(int); void CRYPTO_add(int *, int, int); + +/* this is a macro in 1.1.0 */ +void OPENSSL_free(void *); """ CUSTOMIZATIONS = """ |