From ccb9fb0b26fa8fed9320a0b2e0ca86202dd4b3de Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 20 Mar 2013 13:34:16 +0000 Subject: 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/missing.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'include/ruby/missing.h') 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 -#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 #endif #if !defined(HAVE_STRUCT_TIMESPEC) +# if defined(HAVE_SYS_TIME_H) +# include +# endif struct timespec { time_t tv_sec; /* seconds */ long tv_nsec; /* nanoseconds */ -- cgit v1.2.3