[pypy-commit] pypy py3.6: merge default into py3.6

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r97204:d2f8e364e52d
Date: 2019-08-17 22:04 +0300
http://bitbucket.org/pypy/pypy/changeset/d2f8e364e52d/

Log:	merge default into py3.6

diff --git a/lib_pypy/_cffi_ssl/_cffi_src/openssl/pypy_win32_extra.py b/lib_pypy/_cffi_ssl/_cffi_src/openssl/pypy_win32_extra.py
--- a/lib_pypy/_cffi_ssl/_cffi_src/openssl/pypy_win32_extra.py
+++ b/lib_pypy/_cffi_ssl/_cffi_src/openssl/pypy_win32_extra.py
@@ -68,7 +68,9 @@
 );
 """
 
-MACROS = """
+# cryptography does not use MACROS anymore
+# MACROS = """
+TYPES += """
 #define CERT_STORE_READONLY_FLAG ...
 #define CERT_SYSTEM_STORE_LOCAL_MACHINE ...
 #define CRYPT_E_NOT_FOUND ...