From 83c228fd842134117f6372d0c00ddf2a044ad9b7 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 17 Dec 2008 06:16:55 +0000 Subject: merges r20766 from trunk into ruby_1_9_1. * thread.c (sleep_timeval): cast tv_usec to long to shut up warnings on OSX. [ruby-dev:37449] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 4ab0788534..c154c057b6 100644 --- a/thread.c +++ b/thread.c @@ -805,8 +805,8 @@ sleep_timeval(rb_thread_t *th, struct timeval tv) if (to.tv_sec < tvn.tv_sec) break; if (to.tv_sec == tvn.tv_sec && to.tv_usec <= tvn.tv_usec) break; thread_debug("sleep_timeval: %ld.%.6ld > %ld.%.6ld\n", - (long)to.tv_sec, to.tv_usec, - (long)tvn.tv_sec, tvn.tv_usec); + (long)to.tv_sec, (long)to.tv_usec, + (long)tvn.tv_sec, (long)tvn.tv_usec); tv.tv_sec = to.tv_sec - tvn.tv_sec; if ((tv.tv_usec = to.tv_usec - tvn.tv_usec) < 0) { --tv.tv_sec; -- cgit v1.2.3