diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | win32/win32.c | 10 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Tue Sep 3 11:00:28 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (do_select): constify timeout. + + * win32/win32.c (rb_w32_select_with_thread): constify 10ms wait and + 0ms wait structs. + Tue Sep 3 10:03:42 2013 NAKAMURA Usaku <usa@ruby-lang.org> * test/openssl/test_pair.rb diff --git a/win32/win32.c b/win32/win32.c index b20ca9da82..fa96d417d1 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2766,7 +2766,7 @@ is_invalid_handle(SOCKET sock) /* License: Artistic or GPL */ static int do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, - struct timeval *timeout) + const struct timeval *timeout) { int r = 0; @@ -2910,10 +2910,8 @@ rb_w32_select_with_thread(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, { struct timeval rest; - struct timeval wait; - struct timeval zero; - wait.tv_sec = 0; wait.tv_usec = 10 * 1000; // 10ms - zero.tv_sec = 0; zero.tv_usec = 0; // 0ms + const struct timeval wait = {0, 10 * 1000}; // 10ms + const struct timeval zero = {0, 0}; // 0ms for (;;) { if (th && rb_w32_check_interrupt(th) != WAIT_TIMEOUT) { r = -1; @@ -2936,7 +2934,7 @@ rb_w32_select_with_thread(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, break; } else { - struct timeval *dowait = &wait; + const struct timeval *dowait = &wait; fd_set orig_rd; fd_set orig_wr; |