diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:16:55 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:16:55 +0000 |
| commit | 83c228fd842134117f6372d0c00ddf2a044ad9b7 (patch) | |
| tree | 52b98bfb046af7307df326225325295595e22490 | |
| parent | 423ca671306259789afb99486f087e6eb25f4b2d (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Dec 15 23:48:39 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * thread.c (sleep_timeval): cast tv_usec to long to shut up + warnings on OSX. [ruby-dev:37449] + Mon Dec 15 23:29:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * ruby.c (process_options): revive global sub, gsub, chop, chomp @@ -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; |