mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00
Rename LONG_LONG to PY_LONG_LONG. Fixes #710285.
This commit is contained in:
parent
043bbc7da3
commit
b9a0f91218
15 changed files with 87 additions and 85 deletions
|
@ -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
|
||||
|
|
|
@ -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':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue