* include/ruby/intern.h: should include sys/time.h for struct timeval

  if it exists. [ruby-list:49363]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 02e741f162..c2979725e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 15 23:22:09 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* include/ruby/intern.h: should include sys/time.h for struct timeval
+	  if it exists. [ruby-list:49363]
+
 Tue May 14 20:21:41 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems/config_file.rb:  Lazily load .gem/credentials to only
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index a66848b5b8..3ffb05c933 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -36,6 +36,10 @@ extern "C" {
 #include <sys/types.h>
 #endif
 
+#if defined(HAVE_SYS_TIME_H)
+#include <sys/time.h>
+#endif
+
 #include "ruby/st.h"
 
 #if defined __GNUC__ && __GNUC__ >= 4
diff --git a/version.h b/version.h
index 76a7da67b5..06df6f219e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-05-14"
-#define RUBY_PATCHLEVEL 195
+#define RUBY_RELEASE_DATE "2013-05-15"
+#define RUBY_PATCHLEVEL 196
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"