changeset:   105655:d6c8803c55b4
branch:      3.6
user:        Benjamin Peterson <benjamin@python.org>
date:        Wed Dec 07 23:54:28 2016 -0800
files:       Include/pyport.h
description:
guard HAVE_LONG_LONG definition to prevent redefinition (#28898)
(grafted from 4745d801cae2d57e3432313acd0b76b8b4cc9c75)


diff -r 257a1c7f9507 -r d6c8803c55b4 Include/pyport.h
--- a/Include/pyport.h	Wed Dec 07 23:37:12 2016 -0500
+++ b/Include/pyport.h	Wed Dec 07 23:54:28 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. */