changeset:   105521:1afc3f4f5502
parent:      105519:f200ff0a0057
parent:      105520:4745d801cae2
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Dec 07 23:55:03 2016 -0800
files:       Include/pyport.h
description:
merge 3.6 (#28898)


diff -r f200ff0a0057 -r 1afc3f4f5502 Include/pyport.h
--- a/Include/pyport.h	Wed Dec 07 23:38:30 2016 -0500
+++ b/Include/pyport.h	Wed Dec 07 23:55:03 2016 -0800
@@ -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. */