diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-12-04 07:10:17 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-04 07:10:17 +0900 |
| commit | bc22991ac3ec08fa9e48fc46e49e69115a386ed9 (patch) | |
| tree | 8e152b0f1a0dd79f8d3323a30eb0e9c3112012d4 | |
| parent | 54f2ed6afdde042861f2b620670c0d6d1909d744 (diff) | |
| parent | ea1911d23f492ef3874029a28ac1c28cd1fdb838 (diff) | |
| download | mruby-bc22991ac3ec08fa9e48fc46e49e69115a386ed9.tar.gz mruby-bc22991ac3ec08fa9e48fc46e49e69115a386ed9.zip | |
Merge pull request #4850 from shuujii/silence-Clang-warning-with-MRB_INT64-and-MRB_32BIT-in-time.c
Silence Clang warning with `MRB_INT64` and `MRB_32BIT` in `time.c`
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 7024cc36a..46e32839a 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -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 |