summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-09 06:59:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-09 06:59:23 +0000
commit63ab1901516e3e0afd987a79c07fae261b4045c3 (patch)
treeb436a642d7497ad59d211cc1567c69c3a2b65751
parent7fd78fad3e9d650f7dcdfdd40b3045e3a5443f20 (diff)
* win32/win32.c (rb_w32_{read,write}): should be signed.
Bug #5001 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/win32.h4
-rw-r--r--win32/win32.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fed9e6bb4..1195cbd5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 9 15:59:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_{read,write}): should be signed.
+ Bug #5001
+
Sat Jul 9 14:02:20 2011 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/core.rb: fix multipart form parsing bug. [Bug #3866]
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index 4a56895a84..4d8a66742f 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -693,8 +693,8 @@ int rb_w32_wopen(const WCHAR *, int, ...);
int rb_w32_close(int);
int rb_w32_fclose(FILE*);
int rb_w32_pipe(int[2]);
-size_t rb_w32_read(int, void *, size_t);
-size_t rb_w32_write(int, const void *, size_t);
+ssize_t rb_w32_read(int, void *, size_t);
+ssize_t rb_w32_write(int, const void *, size_t);
int rb_w32_utime(const char *, const struct utimbuf *);
int rb_w32_uutime(const char *, const struct utimbuf *);
long rb_w32_write_console(uintptr_t, int); /* use uintptr_t instead of VALUE because it's not defined yet here */
diff --git a/win32/win32.c b/win32/win32.c
index 6699c2cd44..4d3080663b 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5124,7 +5124,7 @@ rb_w32_close(int fd)
}
#undef read
-size_t
+ssize_t
rb_w32_read(int fd, void *buf, size_t size)
{
SOCKET sock = TO_SOCKET(fd);
@@ -5280,7 +5280,7 @@ rb_w32_read(int fd, void *buf, size_t size)
}
#undef write
-size_t
+ssize_t
rb_w32_write(int fd, const void *buf, size_t size)
{
SOCKET sock = TO_SOCKET(fd);