diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-14 07:10:39 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-14 07:10:39 +0900 |
| commit | 65678f11b427e11c33ffef5ba7adabd87bd4f530 (patch) | |
| tree | 9cab68ef14659ee5e20e076baa25b603957936c9 | |
| parent | 382aed8a12b467532217a9e85430d78a301844ba (diff) | |
| parent | 06a946abb2ee0f23bb48a3841d9b95c0e76c3467 (diff) | |
| download | mruby-65678f11b427e11c33ffef5ba7adabd87bd4f530.tar.gz mruby-65678f11b427e11c33ffef5ba7adabd87bd4f530.zip | |
Merge pull request #2058 from cremno/mruby-time-more-portable
mruby-time: two small changes for portability
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index be011ddee..1ffab9ae6 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -86,7 +86,7 @@ gettimeofday(struct timeval *tv, void *tz) #endif #ifdef NO_GMTIME_R #define gmtime_r(t,r) gmtime(t) -#define localtime_r(t,r) (tzset(),localtime(t)) +#define localtime_r(t,r) localtime(t) #endif #ifndef USE_SYSTEM_TIMEGM @@ -293,7 +293,7 @@ time_mktime(mrb_state *mrb, mrb_int ayear, mrb_int amonth, mrb_int aday, else { nowsecs = mktime(&nowtime); } - if (nowsecs < 0) { + if (nowsecs == (time_t)-1) { mrb_raise(mrb, E_ARGUMENT_ERROR, "Not a valid time."); } |