summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-11-10 08:42:26 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-11-10 08:42:26 (GMT)
commitd915b0847dd5e43b33cf0683bfc473e904572a56 (patch)
treedc2e6417de51d740f2cbde49b8a3156e15143069
parent86e9b6b16424ddbdd1a4a393cd295e95835b7ef2 (diff)
downloadcpython-d915b0847dd5e43b33cf0683bfc473e904572a56.zip
cpython-d915b0847dd5e43b33cf0683bfc473e904572a56.tar.gz
cpython-d915b0847dd5e43b33cf0683bfc473e904572a56.tar.bz2
Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian
platforms.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/fcntlmodule.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3cb7fd4..1a4ad56 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@ Core and Builtins
Library
-------
+- Issue #22821: Fixed fcntl() with integer argument on 64-bit big-endian
+ platforms.
+
- Issues #814253, #9179: Group references and conditional group references now
work in lookbehind assertions in regular expressions.
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index cf0ac19..9325940 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -34,7 +34,7 @@ fcntl_fcntl(PyObject *self, PyObject *args)
{
int fd;
int code;
- long arg;
+ int arg;
int ret;
char *str;
Py_ssize_t len;
@@ -61,7 +61,7 @@ fcntl_fcntl(PyObject *self, PyObject *args)
PyErr_Clear();
arg = 0;
if (!PyArg_ParseTuple(args,
- "O&i|l;fcntl requires a file or file descriptor,"
+ "O&i|I;fcntl requires a file or file descriptor,"
" an integer and optionally a third integer or a string",
conv_descriptor, &fd, &code, &arg)) {
return NULL;