nagachika	2013-03-20 23:06:39 +0900 (Wed, 20 Mar 2013)

  New Revision: 39848

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39848

  Log:
    merge revision(s) 39777: [Backport #8080]
    
    mingw build fix
    
    * configure.in: struct timeval is defined in winsock2.h on mingw.
    
    * include/ruby/missing.h: include time.h for time_t, and sys/time.h
      for timeval and timespec.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/include/ruby/missing.h
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/include/ruby/missing.h
===================================================================
--- ruby_2_0_0/include/ruby/missing.h	(revision 39847)
+++ ruby_2_0_0/include/ruby/missing.h	(revision 39848)
@@ -25,22 +25,21 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/missing.h#L25
 #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 */
Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39847)
+++ ruby_2_0_0/configure.in	(revision 39848)
@@ -902,6 +902,7 @@ $POSTLINK" https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L902
 		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"
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39847)
+++ ruby_2_0_0/version.h	(revision 39848)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39777


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/