From 4346f5d6999dd56ef25ff7f062ee738aaa034014 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Mar 2013 14:07:40 +0000
Subject: 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h          | 2 +-
 win32/Makefile.sub | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/version.h b/version.h
index d6f75a8c70..e56266f369 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 4346e73751..e19b415e78 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -557,11 +557,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #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
-- 
cgit v1.2.3