nagachika	2013-03-20 23:07:40 +0900 (Wed, 20 Mar 2013)

  New Revision: 39849

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

  Log:
    merge revision(s) 39779: [Backport #8080]
    
    Makefile.sub: fix mswin build
    
    * win32/Makefile.sub (config.h): fix mswin build, also VC has time.h
      and struct timeval.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/Makefile.sub

Index: ruby_2_0_0/win32/Makefile.sub
===================================================================
--- ruby_2_0_0/win32/Makefile.sub	(revision 39848)
+++ ruby_2_0_0/win32/Makefile.sub	(revision 39849)
@@ -557,11 +557,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/Makefile.sub#L557
 #define HAVE_FCNTL_H 1
 #define HAVE_SYS_UTIME_H 1
 #define HAVE_FLOAT_H 1
+#define HAVE_TIME_H 1
 #define rb_pid_t int
 #define rb_gid_t int
 #define rb_uid_t int
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 #define HAVE_ST_RDEV 1
+#define HAVE_STRUCT_TIMEVAL 1
 !if $(MSC_VER) >= 1600
 #define HAVE_STDINT_H 1
 !else
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39848)
+++ ruby_2_0_0/version.h	(revision 39849)
@@ -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 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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