aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-28 04:35:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-28 04:35:29 +0000
commit12a4e27f17d5170d2bee6af6408495864679ec3e (patch)
tree8cc3204cc912aa394a95fad0d6dc62fad4799dc4
parentfcf88c1b8df49ba0c4db026f2b17066ea66d3de2 (diff)
downloadruby-12a4e27f17d5170d2bee6af6408495864679ec3e.tar.gz
* thread.c (do_select): rollback r24680. void struct initializer is
invalid. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c045242eb2..b03b806444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 28 13:30:43 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread.c (do_select): rollback r24680. void struct initializer is
+ invalid.
+
Fri Aug 28 11:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* method.h (rb_method_definition_t): split from rb_method_entry_
diff --git a/thread.c b/thread.c
index f00b5dce71..05d129de2a 100644
--- a/thread.c
+++ b/thread.c
@@ -2355,7 +2355,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
struct timeval *timeout)
{
int result, lerrno;
- fd_set orig_read = {}, orig_write = {}, orig_except = {};
+ fd_set orig_read, orig_write, orig_except;
#ifndef linux
double limit = 0;