diff options
| -rw-r--r-- | Lib/test/clinic.test | 4 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 4 | ||||
| -rw-r--r-- | PC/pyconfig.h | 2 | ||||
| -rwxr-xr-x | Tools/clinic/clinic.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test index 0d84d5e..6ee9dc5 100644 --- a/Lib/test/clinic.test +++ b/Lib/test/clinic.test @@ -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] diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index a18a8e7..baa6907 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -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); } diff --git a/PC/pyconfig.h b/PC/pyconfig.h index d407e1d..6a437ce 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -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. */ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index c5edc7c..403d8a4 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -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) |