diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 13:34:16 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 13:34:16 +0000 |
| commit | ccb9fb0b26fa8fed9320a0b2e0ca86202dd4b3de (patch) | |
| tree | a35485051eaf0abe7d25f5a1e30a0563e90eea08 /include | |
| parent | 55f14b455138e2094371a22954f8f29587b6c456 (diff) | |
merge revision(s) 39772,39773: [Backport #8080]
* configure.in: check struct timeval exist or not.
* include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
properly. and don't include sys/time.h if struct timeval exist.
* file.c: include sys/time.h explicitly.
* random.c: ditto.
* thread_pthread.c: ditto.
* time.c: ditto.
* ext/date/date_strftime.c: ditto.
* include/ruby/missing.h (struct timespec): include <sys/time.h>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/missing.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 1297c43a7a..616e699ad5 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -25,20 +25,26 @@ extern "C" { #include RUBY_EXTCONF_H #endif -#if defined(HAVE_SYS_TIME_H) +#if !defined(HAVE_STRUCT_TIMEVAL) +# if defined(HAVE_SYS_TIME_H) # include <sys/time.h> -#elif !defined(_WIN32) +# elif !defined(_WIN32) # define time_t long struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; -#endif +# endif +#endif /* HAVE_STRUCT_TIMEVAL */ + #if defined(HAVE_SYS_TYPES_H) # include <sys/types.h> #endif #if !defined(HAVE_STRUCT_TIMESPEC) +# if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +# endif struct timespec { time_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ |