diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 21:51:51 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-27 21:51:51 (GMT) |
commit | 121fbe47455e15184ff20bc10bcea9646368b026 (patch) | |
tree | 3d76c669ed859343bc8360380b1ea913b7968575 /Modules/_io/bufferedio.c | |
parent | 227c4858bc336de1ff59a984f322da3100fb9992 (diff) | |
download | cpython-121fbe47455e15184ff20bc10bcea9646368b026.zip cpython-121fbe47455e15184ff20bc10bcea9646368b026.tar.gz cpython-121fbe47455e15184ff20bc10bcea9646368b026.tar.bz2 |
Merged revisions 75881 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75881 | mark.dickinson | 2009-10-27 21:49:48 +0000 (Tue, 27 Oct 2009) | 10 lines
Merged revisions 75879 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75879 | mark.dickinson | 2009-10-27 21:48:20 +0000 (Tue, 27 Oct 2009) | 3 lines
Silence gcc warnings when trying to print an off_t using "lld", on platforms
where off_t has type long (e.g., 64-bit Linux).
........
................
Diffstat (limited to 'Modules/_io/bufferedio.c')
-rw-r--r-- | Modules/_io/bufferedio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 41a14e4..e3deb10 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -581,7 +581,7 @@ _buffered_raw_tell(buffered *self) if (!PyErr_Occurred()) PyErr_Format(PyExc_IOError, "Raw stream returned invalid position %" PY_PRIdOFF, - n); + (PY_OFF_T_COMPAT)n); return -1; } self->abs_pos = n; @@ -614,7 +614,7 @@ _buffered_raw_seek(buffered *self, Py_off_t target, int whence) if (!PyErr_Occurred()) PyErr_Format(PyExc_IOError, "Raw stream returned invalid position %" PY_PRIdOFF, - n); + (PY_OFF_T_COMPAT)n); return -1; } self->abs_pos = n; |