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

[victor.stinner]

https://hg.python.org/cpython/rev/c9b846f48752
changeset:   106006:c9b846f48752
parent:      106002:6217da1e3879
parent:      106005:fad67c66885f
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Jan 05 22:59:11 2017 +0100
summary:
  Merge 3.6

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


diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -39,7 +39,7 @@
 
 // long long is required. Ensure HAVE_LONG_LONG is defined for compatibility.
 #ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG
+#define HAVE_LONG_LONG 1
 #endif
 #ifndef PY_LONG_LONG
 #define PY_LONG_LONG long long

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