admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mruby-time with MRB_WITHOUT_FLOAT; ref d74355061

Browse Source
This commit is contained in:
dearblue
2019-07-27 14:42:37 +09:00
parent 42fb251d0a
commit 1467c14adc
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+11 -2
View File
@@ -4,7 +4,10 @@
** See Copyright Notice in mruby.h
*/
#ifndef MRB_WITHOUT_FLOAT
#include <math.h>
#endif
#include <time.h>
#include <mruby.h>
#include <mruby/class.h>
@@ -26,8 +29,10 @@ double round(double x) {
}
#endif
#if !defined(__MINGW64__) && defined(_WIN32)
# define llround(x) round(x)
#ifdef MRB_WITHOUT_FLOAT
# if !defined(__MINGW64__) && defined(_WIN32)
# define llround(x) round(x)
# endif
#endif
#if defined(__MINGW64__) || defined(__MINGW32__)
@@ -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->sec = tsec;
#ifdef MRB_WITHOUT_FLOAT
tm->usec = (time_t)usec;
#else
tm->usec = (time_t)llround((sec - tm->sec) * 1.0e6 + usec);
#endif
if (tm->usec < 0) {
long sec2 = (long)NDIV(tm->usec,1000000); /* negative div */
tm->usec -= sec2 * 1000000;