diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-14 16:30:48 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-03-14 16:30:48 +0900 |
| commit | e893349e95259dd7902048928525e30352478c7d (patch) | |
| tree | b46bb6589830f7c18eeb80ab6ebe51e6c320e089 | |
| parent | 94df66fb08c91135a4c37731fabf6f521a940bb0 (diff) | |
| parent | 3843a286b6e3cd68cc8a1ef5eadfb9a814b49c5a (diff) | |
| download | mruby-e893349e95259dd7902048928525e30352478c7d.tar.gz mruby-e893349e95259dd7902048928525e30352478c7d.zip | |
Merge pull request #1857 from mitchellh/f-fix-mingw-time
Don't redefine timeval in MinGW environments
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 3ba3c66ba..be011ddee 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -53,10 +53,14 @@ # endif typedef long suseconds_t; + +# ifndef __MINGW64__ struct timeval { time_t tv_sec; suseconds_t tv_usec; }; +# endif + static int gettimeofday(struct timeval *tv, void *tz) { |