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

Merge pull request #4850 from shuujii/silence-Clang-warning-with-MRB_INT64-and-MRB_32BIT-in-time.c

Browse Source 
Silence Clang warning with `MRB_INT64` and `MRB_32BIT` in `time.c`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-12-04 07:10:17 +09:00
committed by GitHub
parent 54f2ed6afd ea1911d23f
commit bc22991ac3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+10 -2
View File
@@ -11,6 +11,7 @@
#include <mruby.h>
#include <mruby/class.h>
#include <mruby/data.h>
#include <mruby/numeric.h>
#include <mruby/time.h>
#ifndef MRB_DISABLE_STDIO
@@ -223,6 +224,13 @@ typedef int64_t mrb_time_int;
# define MRB_TIME_MAX (sizeof(time_t) <= 4 ? INT32_MAX : INT64_MAX)
#endif
static mrb_bool
fixable_time_t_p(time_t v)
{
if (MRB_INT_MIN <= MRB_TIME_MIN && MRB_TIME_MAX <= MRB_INT_MAX) return TRUE;
return FIXABLE(v);
}
static time_t
mrb_to_time_t(mrb_state *mrb, mrb_value obj, time_t *usec)
{
@@ -868,7 +876,7 @@ mrb_time_to_i(mrb_state *mrb, mrb_value self)
tm = time_get_ptr(mrb, self);
#ifndef MRB_WITHOUT_FLOAT
if (tm->sec > MRB_INT_MAX || tm->sec < MRB_INT_MIN) {
if (!fixable_time_t_p(tm->sec)) {
return mrb_float_value(mrb, (mrb_float)tm->sec);
}
#endif
@@ -884,7 +892,7 @@ mrb_time_usec(mrb_state *mrb, mrb_value self)
tm = time_get_ptr(mrb, self);
#ifndef MRB_WITHOUT_FLOAT
if (tm->usec > MRB_INT_MAX || tm->usec < MRB_INT_MIN) {
if (!fixable_time_t_p(tm->usec)) {
return mrb_float_value(mrb, (mrb_float)tm->usec);
}
#endif