[Python-checkins] cpython (merge default -> default): Merge
antoine.pitrou
python-checkins at python.org
Tue Oct 11 22:48:13 CEST 2011
http://hg.python.org/cpython/rev/dcce928271c3
changeset: 72871:dcce928271c3
parent: 72870:e2cb12decd9f
parent: 72869:32b1999410de
user: Antoine Pitrou <solipsis at pitrou.net>
date: Tue Oct 11 22:43:51 2011 +0200
summary:
Merge
files:
Modules/_io/fileio.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -552,12 +552,12 @@
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 @@
{
#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 @@
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list