Merged revisions 75729 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75729 | mark.dickinson | 2009-10-26 20:02:55 +0000 (Mon, 26 Oct 2009) | 10 lines
Merged revisions 75728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75728 | mark.dickinson | 2009-10-26 19:59:23 +0000 (Mon, 26 Oct 2009) | 3 lines
Use correct conversion specifier and length modifier when printing an
integer of type off_t. Also, don't assume that long long is available.
........
................
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index d8b6471..41a14e4 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -580,7 +580,8 @@
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
- "Raw stream returned invalid position %zd", n);
+ "Raw stream returned invalid position %" PY_PRIdOFF,
+ n);
return -1;
}
self->abs_pos = n;
@@ -612,7 +613,8 @@
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
- "Raw stream returned invalid position %zd", n);
+ "Raw stream returned invalid position %" PY_PRIdOFF,
+ n);
return -1;
}
self->abs_pos = n;