From 4c926e9f15c42ef789e0af5ca2f15dc6188d1b3c Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 30 Apr 2011 11:08:39 +0000 Subject: * thread.c (do_select): remove useless ifdef. time calculation is not heavy weight. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index c70e24461b..ce84ed5566 100644 --- a/thread.c +++ b/thread.c @@ -2503,8 +2503,6 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except, fd_set UNINITIALIZED_VAR(orig_read); fd_set UNINITIALIZED_VAR(orig_write); fd_set UNINITIALIZED_VAR(orig_except); - -#ifndef linux double limit = 0; struct timeval wait_rest; # if defined(__CYGWIN__) || defined(_WIN32) @@ -2522,7 +2520,6 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except, wait_rest = *timeout; timeout = &wait_rest; } -#endif if (read) orig_read = *read; if (write) orig_write = *write; @@ -2583,7 +2580,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except, if (read) *read = orig_read; if (write) *write = orig_write; if (except) *except = orig_except; -#ifndef linux + if (timeout) { double d = limit - timeofday(); @@ -2592,7 +2589,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except, if (wait_rest.tv_sec < 0) wait_rest.tv_sec = 0; if (wait_rest.tv_usec < 0) wait_rest.tv_usec = 0; } -#endif + goto retry; default: break; -- cgit v1.2.3