diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-24 15:46:13 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-24 15:46:13 (GMT) |
| commit | 61f77b57fdfcc8a630667dda3cbb8c5ac502f438 (patch) | |
| tree | d05b378ce8aa5c1ad19daa86db92a9c9245db8a9 /Modules | |
| parent | 1ef7f6e1834cf8d5bc462f3f5845e294a7d54220 (diff) | |
| download | cpython-61f77b57fdfcc8a630667dda3cbb8c5ac502f438.zip cpython-61f77b57fdfcc8a630667dda3cbb8c5ac502f438.tar.gz cpython-61f77b57fdfcc8a630667dda3cbb8c5ac502f438.tar.bz2 | |
Merged revisions 72887 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72887 | antoine.pitrou | 2009-05-24 17:40:09 +0200 (dim., 24 mai 2009) | 6 lines
Issue #1309352: fcntl now converts its third arguments to a C `long` rather
than an int, which makes some operations possible under 64-bit Linux (e.g.
DN_MULTISHOT with F_NOTIFY).
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/fcntlmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 5331ea8..683c5b6 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -34,7 +34,7 @@ fcntl_fcntl(PyObject *self, PyObject *args) { int fd; int code; - int arg; + long 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|i;fcntl requires a file or file descriptor," + "O&i|l;fcntl requires a file or file descriptor," " an integer and optionally a third integer or a string", conv_descriptor, &fd, &code, &arg)) { return NULL; |