summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-11 01:21:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-11 01:21:10 +0000
commitfe244c77b0ac09fedbb000eb80c8c0ac599e1a00 (patch)
treec6e15d9a35ea93025762a4e35caa49007b8ba4f3
parent71fdb43e6ecab9d48c24c6e422685c86406a5dda (diff)
* thread_pthread.c (native_cond_timeout): wrap conditinally used label.
* thread_pthread.c (native_sleep): remove unused variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 379761c..d1b8847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 11 10:20:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@fsij.org>
* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
diff --git a/thread_pthread.c b/thread_pthread.c
index 4ada057..028fb3f 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -349,7 +349,9 @@ native_cond_timeout(rb_thread_cond_t *cond, struct timespec timeout_rel)
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 @@ static void
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;