From: Antoine Pitrou Date: Thu, 12 May 2011 00:07:00 +0000 (+0200) Subject: Fix compile error under Windows X-Git-Tag: v3.3.0a1~2300 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e19e1195817891fdc4ce4c3f0eddde845bf3214;p=thirdparty%2FPython%2Fcpython.git Fix compile error under Windows --- diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index 8e3d3c67b582..dfe593f54dda 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -954,14 +954,16 @@ buffered_readinto(buffered *self, PyObject *args) /* If remaining bytes is larger than internal buffer size, copy * directly into caller's buffer. */ if (remaining > self->buffer_size) { - n = _bufferedreader_raw_read(self, buf.buf + written, remaining); + n = _bufferedreader_raw_read(self, (char *) buf.buf + written, + remaining); } else { n = _bufferedreader_fill_buffer(self); if (n > 0) { if (n > remaining) n = remaining; - memcpy(buf.buf + written, self->buffer + self->pos, n); + memcpy((char *) buf.buf + written, + self->buffer + self->pos, n); self->pos += n; continue; /* short circuit */ }