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).
  ........
................
This commit is contained in:
Mark Dickinson 2009-10-27 21:51:51 +00:00
parent 227c4858bc
commit 121fbe4745
2 changed files with 14 additions and 3 deletions

View file

@ -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;