merges r21725 from trunk into ruby_1_9_1.

* thread.c (rb_time_timeval): made a real prototype.  a patch from
  Marcus Rueckert <darix AT opensu.se> at [ruby-core:21492].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d87ce28823..f55f52b4b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 22 11:33:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_time_timeval): made a real prototype.  a patch from
+	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:21492].
+
 Wed Jan 21 21:43:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_ungetbyte, rb_io_ungetc): allows nil to reset EOF
diff --git a/thread.c b/thread.c
index 3eb304d007..c085f7f9dd 100644
--- a/thread.c
+++ b/thread.c
@@ -917,7 +917,7 @@ rb_thread_interrupted(VALUE thval)
     return RUBY_VM_INTERRUPTED(th);
 }
 
-struct timeval rb_time_timeval();
+struct timeval rb_time_timeval(VALUE);
 
 void
 rb_thread_sleep(int sec)