diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-11 20:43:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-11 20:43:51 (GMT) |
| commit | b89600137712bf5a607404ea0aefbb10de31efc5 (patch) | |
| tree | 3efc11e746aacc791cd6e2c63ae506dff4ff37cc | |
| parent | ffa547e139e4c314a07988ba66d70096affbc09c (diff) | |
| parent | a2a6477ba0655825d164001917afcacf49741429 (diff) | |
| download | cpython-b89600137712bf5a607404ea0aefbb10de31efc5.zip cpython-b89600137712bf5a607404ea0aefbb10de31efc5.tar.gz cpython-b89600137712bf5a607404ea0aefbb10de31efc5.tar.bz2 | |
Merge
| -rw-r--r-- | Modules/_io/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index a16d13c..dc59455 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -552,12 +552,12 @@ fileio_readinto(fileio *self, PyObject *args) static size_t new_buffersize(fileio *self, size_t currentsize #ifdef HAVE_FSTAT - , off_t pos, off_t end + , Py_off_t pos, Py_off_t end #endif ) { #ifdef HAVE_FSTAT - if (end != (off_t)-1) { + if (end != (Py_off_t)-1) { /* Files claiming a size smaller than SMALLCHUNK may actually be streaming pseudo-files. In this case, we apply the more aggressive algorithm below. @@ -584,7 +584,7 @@ fileio_readall(fileio *self) { #ifdef HAVE_FSTAT struct stat st; - off_t pos, end; + Py_off_t pos, end; #endif PyObject *result; Py_ssize_t total = 0; @@ -609,7 +609,7 @@ fileio_readall(fileio *self) if (fstat(self->fd, &st) == 0) end = st.st_size; else - end = (off_t)-1; + end = (Py_off_t)-1; #endif while (1) { #ifdef HAVE_FSTAT |