From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 8 Dec 2016 07:54:28 +0000 (-0800)
Subject: guard HAVE_LONG_LONG definition to prevent redefinition (#28898)
X-Git-Tag: v3.6.0rc2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5e688a8ff37d4fff06c06d6ec625ac6653306f6;p=thirdparty%2FPython%2Fcpython.git

guard HAVE_LONG_LONG definition to prevent redefinition (#28898)
(grafted from 4745d801cae2d57e3432313acd0b76b8b4cc9c75)
---

diff --git a/Include/pyport.h b/Include/pyport.h
index 20f3db748155..28bf4b214851 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -37,9 +37,10 @@ Used in:  Py_SAFE_DOWNCAST
  * 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. */