Skip to content

M
mruby
Commit 1467c14a authored by dearblue's avatar dearblue
Browse files
Options

Fix mruby-time with `MRB_WITHOUT_FLOAT`; ref d7435506

parent 42fb251d
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
mrbgems/mruby-time/src/time.c
View file @ 1467c14a
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
** See Copyright Notice in mruby.h ** See Copyright Notice in mruby.h
*/ */
#ifndef MRB_WITHOUT_FLOAT
#include <math.h> #include <math.h>
#endif
#include <time.h> #include <time.h>
#include <mruby.h> #include <mruby.h>
#include <mruby/class.h> #include <mruby/class.h>
...@@ -26,8 +29,10 @@ double round(double x) { ...@@ -26,8 +29,10 @@ double round(double x) {
} }
#endif #endif
#if !defined(__MINGW64__) && defined(_WIN32) #ifdef MRB_WITHOUT_FLOAT
# define llround(x) round(x) # if !defined(__MINGW64__) && defined(_WIN32)
# define llround(x) round(x)
# endif
#endif #endif
#if defined(__MINGW64__) || defined(__MINGW32__) #if defined(__MINGW64__) || defined(__MINGW32__)
...@@ -276,7 +281,11 @@ time_alloc(mrb_state *mrb, mrb_sec sec, mrb_int usec, enum mrb_timezone timezone ...@@ -276,7 +281,11 @@ time_alloc(mrb_state *mrb, mrb_sec sec, mrb_int usec, enum mrb_timezone timezone
} }
tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time)); tm = (struct mrb_time *)mrb_malloc(mrb, sizeof(struct mrb_time));
tm->sec = tsec; tm->sec = tsec;
#ifdef MRB_WITHOUT_FLOAT
tm->usec = (time_t)usec;
#else
tm->usec = (time_t)llround((sec - tm->sec) * 1.0e6 + usec); tm->usec = (time_t)llround((sec - tm->sec) * 1.0e6 + usec);
#endif
if (tm->usec < 0) { if (tm->usec < 0) {
long sec2 = (long)NDIV(tm->usec,1000000); /* negative div */ long sec2 = (long)NDIV(tm->usec,1000000); /* negative div */
tm->usec -= sec2 * 1000000; tm->usec -= sec2 * 1000000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment