summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-time/src/time.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-05-26 21:27:16 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-05-26 21:27:16 +0900
commit7b8ae1b8b64c281d983723d2c127f5713ad6e640 (patch)
tree11f5833e6d9f3c2618cd192cd2e651b5eebba652 /mrbgems/mruby-time/src/time.c
parent6557ee938a5404b31b064f08c58bb54dfc0ac468 (diff)
parentec3a5f33ba8b52fc9d5ee21cdb0a689622608f98 (diff)
downloadmruby-7b8ae1b8b64c281d983723d2c127f5713ad6e640.tar.gz
mruby-7b8ae1b8b64c281d983723d2c127f5713ad6e640.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'mrbgems/mruby-time/src/time.c')
-rw-r--r--mrbgems/mruby-time/src/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 6a44590a8..2a2aabe72 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -358,7 +358,7 @@ mrb_time_minus(mrb_state *mrb, mrb_value self)
if (tm2) {
f = (mrb_float)(tm->sec - tm2->sec)
+ (mrb_float)(tm->usec - tm2->usec) / 1.0e6;
- return mrb_float_value(f);
+ return mrb_float_value(mrb, f);
}
else {
mrb_get_args(mrb, "f", &f);
@@ -628,7 +628,7 @@ mrb_time_to_f(mrb_state *mrb, mrb_value self)
tm = (struct mrb_time*)mrb_data_get_ptr(mrb, self, &mrb_time_type);
if (!tm) return mrb_nil_value();
- return mrb_float_value((mrb_float)tm->sec + (mrb_float)tm->usec/1.0e6);
+ return mrb_float_value(mrb, (mrb_float)tm->sec + (mrb_float)tm->usec/1.0e6);
}
/* 15.2.19.7.25 */