commit 4ebcdac556282b159f5ea2ea480d81cb7cb35ad6
author Benjamin Peterson <benjamin@python.org> Wed Dec 07 23:55:03 2016 -0800
committer Benjamin Peterson <benjamin@python.org> Wed Dec 07 23:55:03 2016 -0800
tree c082e8a01eed934b73eb83b18bffff047b9c4a99
parent 864a78ed72525041ca52fc99ead8af48c02f6cd5
parent 0d5742dec0a44c6fdbb544bc683855ff78554e72

merge 3.6 (#28898)

Include/pyport.h

diff --git a/Include/pyport.h b/Include/pyport.h
index f7a16b2..3167c04 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -37,9 +37,10 @@
  * integral synonyms.  Only define the ones we actually need.
  */
 
-// long long is required now. Define HAVE_LONG_LONG unconditionally for
-// compatibility.
+// long long is required. Ensure HAVE_LONG_LONG is defined for compatibility.
+#ifndef HAVE_LONG_LONG
 #define HAVE_LONG_LONG
+#endif
 #ifndef PY_LONG_LONG
 #define PY_LONG_LONG long long
 /* If LLONG_MAX is defined in limits.h, use that. */