Commit a9ed91e6 authored by Sergey Fedoseev's avatar Sergey Fedoseev Committed by Serhiy Storchaka

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

parent 919f0bc8
...@@ -1269,7 +1269,7 @@ test_long_long_converter(PyObject *module, PyObject *const *args, Py_ssize_t nar ...@@ -1269,7 +1269,7 @@ test_long_long_converter(PyObject *module, PyObject *const *args, Py_ssize_t nar
goto exit; goto exit;
} }
a = PyLong_AsLongLong(args[0]); a = PyLong_AsLongLong(args[0]);
if (a == (PY_LONG_LONG)-1 && PyErr_Occurred()) { if (a == -1 && PyErr_Occurred()) {
goto exit; goto exit;
} }
skip_optional: skip_optional:
...@@ -1281,7 +1281,7 @@ exit: ...@@ -1281,7 +1281,7 @@ exit:
static PyObject * static PyObject *
test_long_long_converter_impl(PyObject *module, long long a) 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] /*[clinic input]
......
...@@ -4763,8 +4763,8 @@ dict_get_version(PyObject *self, PyObject *args) ...@@ -4763,8 +4763,8 @@ dict_get_version(PyObject *self, PyObject *args)
version = dict->ma_version_tag; version = dict->ma_version_tag;
Py_BUILD_ASSERT(sizeof(unsigned PY_LONG_LONG) >= sizeof(version)); Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(version));
return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)version); return PyLong_FromUnsignedLongLong((unsigned long long)version);
} }
......
...@@ -296,7 +296,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ ...@@ -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_HKEY 8
# define SIZEOF_SIZE_T 8 # define SIZEOF_SIZE_T 8
/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff /* 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 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 then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64
should define this. */ should define this. */
......
...@@ -3016,7 +3016,7 @@ class long_long_converter(CConverter): ...@@ -3016,7 +3016,7 @@ class long_long_converter(CConverter):
goto exit; goto exit;
}}}} }}}}
{paramname} = PyLong_AsLongLong({argname}); {paramname} = PyLong_AsLongLong({argname});
if ({paramname} == (PY_LONG_LONG)-1 && PyErr_Occurred()) {{{{ if ({paramname} == -1 && PyErr_Occurred()) {{{{
goto exit; goto exit;
}}}} }}}}
""".format(argname=argname, paramname=self.name) """.format(argname=argname, paramname=self.name)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment