summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 05:57:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 05:57:58 +0000
commit4b514ef442fe3e1cd2a456824155606a80ff807a (patch)
tree0c2fbe81e6ca9b8ab4de2f8336f76c7ee114fd00
parent6e23f5093e372dc02f888d5163524e2e46444fd7 (diff)
downloadruby-4b514ef442fe3e1cd2a456824155606a80ff807a.tar.gz
ruby-4b514ef442fe3e1cd2a456824155606a80ff807a.tar.xz
ruby-4b514ef442fe3e1cd2a456824155606a80ff807a.zip
* gc.c (getrusage_time): should return the value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42005759c..517499df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Aug 14 14:56:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Aug 14 14:57:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (getrusage_time): should return the value.
* thread.c (rb_thread_priority_set): get rid of C99 feature.
diff --git a/gc.c b/gc.c
index 736dd6302..2bfb27d35 100644
--- a/gc.c
+++ b/gc.c
@@ -140,6 +140,7 @@ getrusage_time(void)
t += (double)(DWORD)(q >> 16) * (1 << 16);
t += (DWORD)q & ~(~0 << 16);
#endif
+ return t;
#else
return 0.0;
#endif