merge 3.6

2016-09-18 18:03:04 -07:00 · 2016-09-18 18:03:04 -07:00 · d1b44d9301
parent 190a32f3ed 41e35f37ed
commit d1b44d9301
1 changed files with 3 additions and 0 deletions
--- a/Include/pyport.h
+++ b/Include/pyport.h
@ -37,6 +37,9 @@ Used in:  Py_SAFE_DOWNCAST
 * integral synonyms.  Only define the ones we actually need.
 */

+// long long is required now. Define HAVE_LONG_LONG unconditionally for
+// compatibility.
+#define HAVE_LONG_LONG
 #ifndef PY_LONG_LONG
 #define PY_LONG_LONG long long
 /* If LLONG_MAX is defined in limits.h, use that. */