summaryrefslogtreecommitdiffstats
path: root/Include/pyport.h
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-12-08 07:55:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-12-08 07:55:03 (GMT)
commit4ebcdac556282b159f5ea2ea480d81cb7cb35ad6 (patch)
treec082e8a01eed934b73eb83b18bffff047b9c4a99 /Include/pyport.h
parent864a78ed72525041ca52fc99ead8af48c02f6cd5 (diff)
parent0d5742dec0a44c6fdbb544bc683855ff78554e72 (diff)
downloadcpython-4ebcdac556282b159f5ea2ea480d81cb7cb35ad6.zip
cpython-4ebcdac556282b159f5ea2ea480d81cb7cb35ad6.tar.gz
cpython-4ebcdac556282b159f5ea2ea480d81cb7cb35ad6.tar.bz2
merge 3.6 (#28898)
Diffstat (limited to 'Include/pyport.h')
-rw-r--r--Include/pyport.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index f7a16b2..3167c04 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. */