summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-05-12 00:07:00 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-05-12 00:07:00 (GMT)
commit4e19e1195817891fdc4ce4c3f0eddde845bf3214 (patch)
tree4e215f36656d06b5bf5aeaf2357f8988182ec943
parent3486a98dcd7f11215b61be3428edbbc9b6aa3164 (diff)
downloadcpython-4e19e1195817891fdc4ce4c3f0eddde845bf3214.zip
cpython-4e19e1195817891fdc4ce4c3f0eddde845bf3214.tar.gz
cpython-4e19e1195817891fdc4ce4c3f0eddde845bf3214.tar.bz2
Fix compile error under Windows
-rw-r--r--Modules/_io/bufferedio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 8e3d3c6..dfe593f 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 */
}