[Python-checkins] cpython (merge 3.6 -> default): merge 3.6

[benjamin.peterson]

https://hg.python.org/cpython/rev/eb0a16c73004
changeset:   103935:eb0a16c73004
parent:      103933:edd02bf0eb6c
parent:      103934:cf6e9968ebb7
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 18 18:03:04 2016 -0700
summary:
  merge 3.6

files:
  Include/pyport.h |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -37,6 +37,9 @@
  * 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. */

-- 
Repository URL: https://hg.python.org/cpython