aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ce831222cd..26ffef94a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 19 19:28:47 2010 Tanaka Akira <akr@fsij.org>
+
+ * thread_pthread.c (native_sleep): suppress a warning for platforms
+ which time_t is int.
+
Thu Aug 19 18:15:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: Add a tool to merge commits between branches.
diff --git a/thread_pthread.c b/thread_pthread.c
index e832b82fe1..e835bf81cd 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -612,7 +612,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv)
}
}
- thread_debug("native_sleep %ld\n", tv ? tv->tv_sec : -1);
+ thread_debug("native_sleep %ld\n", (long)(tv ? tv->tv_sec : -1));
GVL_UNLOCK_BEGIN();
{
pthread_mutex_lock(&th->interrupt_lock);