summaryrefslogtreecommitdiffstats
path: root/Python
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 /Python
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 'Python')
-rw-r--r--Python/getargs.c12
-rw-r--r--Python/modsupport.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 02897f3..1f37e41 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -550,10 +550,10 @@ convertsimple(PyObject *arg, char **p_format, va_list *p_va, char *msgbuf,
}
#ifdef HAVE_LONG_LONG
- case 'L': {/* LONG_LONG */
- LONG_LONG *p = va_arg( *p_va, LONG_LONG * );
- LONG_LONG ival = PyLong_AsLongLong( arg );
- if( ival == (LONG_LONG)-1 && PyErr_Occurred() ) {
+ case 'L': {/* PY_LONG_LONG */
+ PY_LONG_LONG *p = va_arg( *p_va, PY_LONG_LONG * );
+ PY_LONG_LONG ival = PyLong_AsLongLong( arg );
+ if( ival == (PY_LONG_LONG)-1 && PyErr_Occurred() ) {
return converterr("long<L>", arg, msgbuf, bufsize);
} else {
*p = ival;
@@ -1320,9 +1320,9 @@ skipitem(char **p_format, va_list *p_va)
}
#ifdef HAVE_LONG_LONG
- case 'L': /* LONG_LONG int */
+ case 'L': /* PY_LONG_LONG int */
{
- (void) va_arg(*p_va, LONG_LONG *);
+ (void) va_arg(*p_va, PY_LONG_LONG *);
break;
}
#endif
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 41e0c82..9725a1b 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -291,7 +291,7 @@ do_mkvalue(char **p_format, va_list *p_va)
#ifdef HAVE_LONG_LONG
case 'L':
- return PyLong_FromLongLong((LONG_LONG)va_arg(*p_va, LONG_LONG));
+ return PyLong_FromLongLong((PY_LONG_LONG)va_arg(*p_va, PY_LONG_LONG));
#endif
#ifdef Py_USING_UNICODE
case 'u':