diff options
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | include/ruby/missing.h | 15 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.in b/configure.in index aa15455815..91577e8e91 100644 --- a/configure.in +++ b/configure.in @@ -902,6 +902,7 @@ $POSTLINK" ac_cv_func_flock=yes ac_cv_func_gmtime_r=yes rb_cv_large_fd_select=yes + ac_cv_type_struct_timeval=yes AC_LIBOBJ([langinfo]) ], [os2-emx*], [ LIBS="-lm $LIBS" diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 7ae2530239..fc333e1a47 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -25,22 +25,21 @@ extern "C" { #include RUBY_EXTCONF_H #endif +#if defined(HAVE_TIME_H) +# include <time.h> +#endif +#if defined(HAVE_SYS_TIME_H) +# include <sys/time.h> +#endif + #if !defined(HAVE_STRUCT_TIMEVAL) -# if defined(HAVE_SYS_TIME_H) -# include <sys/time.h> -# elif !defined(_WIN32) -# define time_t long struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; -# endif #endif /* HAVE_STRUCT_TIMEVAL */ #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 */ @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-20" -#define RUBY_PATCHLEVEL 81 +#define RUBY_PATCHLEVEL 82 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 |