summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-03 13:50:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-03 13:50:55 +0000
commitac46d76ce83e8ccf5ec20ea0b671175dbeb0cdee (patch)
tree0d9b1922700255eb083821bd7b7e71a1c3b7b8eb
parentb45c882aec9d5d97261b11704c931c03f8d69639 (diff)
* thread.c (rb_fd_rcopy): suppress warnings on mingw32.
* win32/win32.c (overlapped_socket_io, recvmsg, sendmsg, dupfd): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--thread.c2
-rw-r--r--win32/win32.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/thread.c b/thread.c
index d9d497ad6c..80550eeaaa 100644
--- a/thread.c
+++ b/thread.c
@@ -2471,7 +2471,7 @@ rb_fd_rcopy(fd_set *dst, rb_fdset_t *src)
/* we assume src is the result of select() with dst, so dst should be
* larger or equal than src. */
- if (max > FD_SETSIZE || max > dst->fd_count) {
+ if (max > FD_SETSIZE || (UINT)max > dst->fd_count) {
rb_raise(rb_eArgError, "too large fdsets");
}
diff --git a/win32/win32.c b/win32/win32.c
index 5851377ff2..fc1cd29b2d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3147,7 +3147,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
{
int r;
int ret;
- int mode;
+ int mode = 0;
DWORD flg;
WSAOVERLAPPED wol;
WSABUF wbuf;
@@ -3282,7 +3282,7 @@ recvmsg(int fd, struct msghdr *msg, int flags)
static WSARecvMsg_t pWSARecvMsg = NULL;
WSAMSG wsamsg;
SOCKET s;
- int mode;
+ int mode = 0;
DWORD len;
int ret;
@@ -3340,7 +3340,7 @@ sendmsg(int fd, const struct msghdr *msg, int flags)
static WSASendMsg_t pWSASendMsg = NULL;
WSAMSG wsamsg;
SOCKET s;
- int mode;
+ int mode = 0;
DWORD len;
int ret;
@@ -3811,7 +3811,7 @@ dupfd(HANDLE hDup, char flags, int minfd)
goto close_fds_and_return;
}
fds[filled++] = ret;
- } while (filled < (sizeof(fds)/sizeof(fds[0])));
+ } while (filled < (int)numberof(fds));
ret = dupfd(hDup, flags, minfd);