f9258e
f9258e
# HG changeset patch
f9258e
# User Benjamin Peterson <benjamin@python.org>
f9258e
# Date 1481183668 28800
f9258e
# Node ID 4745d801cae2d57e3432313acd0b76b8b4cc9c75
f9258e
# Parent  148c46d180b2a1510097a1eae79845b61190c879
f9258e
guard HAVE_LONG_LONG definition to prevent redefinition (#28898)
f9258e
f9258e
diff --git a/Include/pyport.h b/Include/pyport.h
f9258e
--- a/Include/pyport.h
f9258e
+++ b/Include/pyport.h
f9258e
@@ -37,9 +37,10 @@ Used in:  Py_SAFE_DOWNCAST
f9258e
  * integral synonyms.  Only define the ones we actually need.
f9258e
  */
f9258e
 
f9258e
-// long long is required now. Define HAVE_LONG_LONG unconditionally for
f9258e
-// compatibility.
f9258e
+// long long is required. Ensure HAVE_LONG_LONG is defined for compatibility.
f9258e
+#ifndef HAVE_LONG_LONG
f9258e
 #define HAVE_LONG_LONG
f9258e
+#endif
f9258e
 #ifndef PY_LONG_LONG
f9258e
 #define PY_LONG_LONG long long
f9258e
 /* If LLONG_MAX is defined in limits.h, use that. */
f9258e