summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2003-03-29 10:06:18 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2003-03-29 10:06:18 (GMT)
commitb9a0f9121876cbc728cbef88f16bb32b92712d2d (patch)
tree2677795fd372f25549f84764a556bee87ec66f43 /Include
parent043bbc7da387f613f3ce60c20063e2a29baff372 (diff)
downloadcpython-b9a0f9121876cbc728cbef88f16bb32b92712d2d.zip
cpython-b9a0f9121876cbc728cbef88f16bb32b92712d2d.tar.gz
cpython-b9a0f9121876cbc728cbef88f16bb32b92712d2d.tar.bz2
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
Diffstat (limited to 'Include')
-rw-r--r--Include/longobject.h8
-rw-r--r--Include/pyport.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/Include/longobject.h b/Include/longobject.h
index 1ac213c..63ca113 100644
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -33,10 +33,10 @@ PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *);
#ifdef HAVE_LONG_LONG
-PyAPI_FUNC(PyObject *) PyLong_FromLongLong(LONG_LONG);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned LONG_LONG);
-PyAPI_FUNC(LONG_LONG) PyLong_AsLongLong(PyObject *);
-PyAPI_FUNC(unsigned LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
+PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG);
+PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG);
+PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *);
+PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *);
#endif /* HAVE_LONG_LONG */
PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int);
diff --git a/Include/pyport.h b/Include/pyport.h
index cc003a6..b68a3b4 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -27,7 +27,7 @@ Used in: Py_uintptr_t
HAVE_LONG_LONG
Meaning: The compiler supports the C type "long long"
-Used in: LONG_LONG
+Used in: PY_LONG_LONG
**************************************************************************/
@@ -55,8 +55,8 @@ Used in: LONG_LONG
*/
#ifdef HAVE_LONG_LONG
-#ifndef LONG_LONG
-#define LONG_LONG long long
+#ifndef PY_LONG_LONG
+#define PY_LONG_LONG long long
#endif
#endif /* HAVE_LONG_LONG */
@@ -78,8 +78,8 @@ typedef unsigned long Py_uintptr_t;
typedef long Py_intptr_t;
#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG)
-typedef unsigned LONG_LONG Py_uintptr_t;
-typedef LONG_LONG Py_intptr_t;
+typedef unsigned PY_LONG_LONG Py_uintptr_t;
+typedef PY_LONG_LONG Py_intptr_t;
#else
# error "Python needs a typedef for Py_uintptr_t in pyport.h."