summaryrefslogtreecommitdiffstats
path: root/Python/getargs.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-09-06 17:46:49 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-09-06 17:46:49 (GMT)
commitaf580dff4af3cb812cdd7a229a4a65059b3bc1ee (patch)
tree69954d6e499793f75edc045e31ade0e0eabb6053 /Python/getargs.c
parent45c7514de406d9ed84e46d80500fb4ac87a94ea8 (diff)
downloadcpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.zip
cpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.tar.gz
cpython-af580dff4af3cb812cdd7a229a4a65059b3bc1ee.tar.bz2
replace PY_LONG_LONG with long long
Diffstat (limited to 'Python/getargs.c')
-rw-r--r--Python/getargs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 008a434..0854cc4 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -769,13 +769,13 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
break;
}
- case 'L': {/* PY_LONG_LONG */
- PY_LONG_LONG *p = va_arg( *p_va, PY_LONG_LONG * );
- PY_LONG_LONG ival;
+ case 'L': {/* long long */
+ long long *p = va_arg( *p_va, long long * );
+ long long ival;
if (float_argument_error(arg))
RETURN_ERR_OCCURRED;
ival = PyLong_AsLongLong(arg);
- if (ival == (PY_LONG_LONG)-1 && PyErr_Occurred())
+ if (ival == (long long)-1 && PyErr_Occurred())
RETURN_ERR_OCCURRED;
else
*p = ival;
@@ -783,8 +783,8 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
}
case 'K': { /* long long sized bitfield */
- unsigned PY_LONG_LONG *p = va_arg(*p_va, unsigned PY_LONG_LONG *);
- unsigned PY_LONG_LONG ival;
+ unsigned long long *p = va_arg(*p_va, unsigned long long *);
+ unsigned long long ival;
if (PyLong_Check(arg))
ival = PyLong_AsUnsignedLongLongMask(arg);
else
@@ -2086,8 +2086,8 @@ skipitem(const char **p_format, va_list *p_va, int flags)
case 'I': /* int sized bitfield */
case 'l': /* long int */
case 'k': /* long int sized bitfield */
- case 'L': /* PY_LONG_LONG */
- case 'K': /* PY_LONG_LONG sized bitfield */
+ case 'L': /* long long */
+ case 'K': /* long long sized bitfield */
case 'n': /* Py_ssize_t */
case 'f': /* float */
case 'd': /* double */