traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-27961: Replace PY_LONG_LONG with long long. (GH-15386)

This commit is contained in:
Sergey Fedoseev 2019-10-21 11:49:48 +05:00 committed by Serhiy Storchaka
parent 919f0bc8c9
commit a9ed91e6c2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/clinic.test
View File

@ -1269,7 +1269,7 @@ test_long_long_converter(PyObject *module, PyObject *const *args, Py_ssize_t nar
goto exit;
}
a = PyLong_AsLongLong(args[0]);
if (a == (PY_LONG_LONG)-1 && PyErr_Occurred()) {
if (a == -1 && PyErr_Occurred()) {
goto exit;
}
skip_optional:
@ -1281,7 +1281,7 @@ exit:
static PyObject *
test_long_long_converter_impl(PyObject *module, long long a)
/*[clinic end generated code: output=3e8083f3aee4f18a input=d5fc81577ff4dd02]*/
/*[clinic end generated code: output=7143b585d7e433e8 input=d5fc81577ff4dd02]*/
/*[clinic input]

4
Modules/_testcapimodule.c
View File

@ -4763,8 +4763,8 @@ dict_get_version(PyObject *self, PyObject *args)
version = dict->ma_version_tag;
Py_BUILD_ASSERT(sizeof(unsigned PY_LONG_LONG) >= sizeof(version));
return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)version);
Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(version));
return PyLong_FromUnsignedLongLong((unsigned long long)version);
}

2
PC/pyconfig.h
View File

@ -296,7 +296,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
# define SIZEOF_HKEY 8
# define SIZEOF_SIZE_T 8
/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff
sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t).
sizeof(off_t) > sizeof(long), and sizeof(long long) >= sizeof(off_t).
On Win64 the second condition is not true, but if fpos_t replaces off_t
then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
should define this. */

2
Tools/clinic/clinic.py
View File

@ -3016,7 +3016,7 @@ class long_long_converter(CConverter):
goto exit;
}}}}
{paramname} = PyLong_AsLongLong({argname});
if ({paramname} == (PY_LONG_LONG)-1 && PyErr_Occurred()) {{{{
if ({paramname} == -1 && PyErr_Occurred()) {{{{
goto exit;
}}}}
""".format(argname=argname, paramname=self.name)