diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-09 04:30:15 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-09 04:30:15 +0000 |
| commit | 63b0601792541615b2ef18c690c167c16593078d (patch) | |
| tree | f9544023a97406547175163c2d8bf2eab283a2e4 | |
| parent | 3c18caa4c2ea88129f01d88fab8174a38281a9d6 (diff) | |
| download | ruby-63b0601792541615b2ef18c690c167c16593078d.tar.gz | |
* win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit
mingw.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Nov 9 13:29:36 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit + mingw. + Tue Nov 9 10:44:19 2010 NARUSE, Yui <naruse@ruby-lang.org> * util.c (ruby_strtod): this code uses FPU's rounding system. diff --git a/win32/win32.c b/win32/win32.c index 2121013e82..5f5a55080a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2935,6 +2935,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags, } else { DWORD size; + DWORD rlen; wbuf.len = len; wbuf.buf = buf; memset(&wol, 0, sizeof(wol)); @@ -2957,7 +2958,8 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags, } }); - finish_overlapped_socket(s, &wol, ret, &r, size); + finish_overlapped_socket(s, &wol, ret, &rlen, size); + r = (int)rlen; } return r; |