[前][次][番号順一覧][スレッド一覧]

ruby-changes:19943

From: nobu <ko1@a...>
Date: Sat, 11 Jun 2011 10:21:17 +0900 (JST)
Subject: [ruby-changes:19943] nobu:r31990 (trunk): * thread_pthread.c (native_cond_timeout): wrap conditinally used label.

nobu	2011-06-11 10:21:10 +0900 (Sat, 11 Jun 2011)

  New Revision: 31990

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31990

  Log:
    * thread_pthread.c (native_cond_timeout): wrap conditinally used label.
    * thread_pthread.c (native_sleep): remove unused variable.

  Modified files:
    trunk/ChangeLog
    trunk/thread_pthread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31989)
+++ ChangeLog	(revision 31990)
@@ -1,3 +1,9 @@
+Sat Jun 11 10:20:52 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* thread_pthread.c (native_cond_timeout): wrap conditinally used label.
+
+	* thread_pthread.c (native_sleep): remove unused variable.
+
 Sat Jun 11 10:15:50 2011  Tanaka Akira  <akr@f...>
 
 	* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
Index: thread_pthread.c
===================================================================
--- thread_pthread.c	(revision 31989)
+++ thread_pthread.c	(revision 31990)
@@ -349,7 +349,9 @@
     now.tv_sec = tv.tv_sec;
     now.tv_nsec = tv.tv_usec * 1000;
 
+#if USE_MONOTONIC_COND
   out:
+#endif
     timeout.tv_sec = now.tv_sec;
     timeout.tv_nsec = now.tv_nsec;
     timeout.tv_sec += timeout_rel.tv_sec;
@@ -828,7 +830,6 @@
 native_sleep(rb_thread_t *th, struct timeval *timeout_tv)
 {
     struct timespec timeout;
-    struct timeval tvn;
     pthread_mutex_t *lock = &th->interrupt_lock;
     rb_thread_cond_t *cond = &th->native_thread_data.sleep_cond;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]