[Python-checkins] cpython (3.6): guard HAVE_LONG_LONG definition to prevent redefinition (#28898)

Fri Dec 16 02:44:42 EST 2016

https://hg.python.org/cpython/rev/d6c8803c55b4
changeset: 105655:d6c8803c55b4
branch: 3.6
user: Benjamin Peterson <benjamin at python.org>
date: Wed Dec 07 23:54:28 2016 -0800
summary:
 guard HAVE_LONG_LONG definition to prevent redefinition (#28898)
(grafted from 4745d801cae2d57e3432313acd0b76b8b4cc9c75)
files:
 Include/pyport.h | 5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Include/pyport.h b/Include/pyport.h
--- 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. */
-- 
Repository URL: https://hg.python.org/cpython
