summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-14 16:08:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-14 16:08:22 +0000
commit4baa00dc2b889a45ac27be5711bb7f905ef76c60 (patch)
treec77c5459006b735349980c3a26d33176307e8802
parenta5ed0865c5c7b7a372c90962a36d3718a067c13b (diff)
* include/ruby/intern.h: should include sys/time.h for struct timeval
if it exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/intern.h4
-rw-r--r--version.h2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d86d95f7bb..19dc1d6b0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 15 01:06:26 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/intern.h: should include sys/time.h for struct timeval
+ if it exists.
+
Wed May 15 00:23:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (warnflags): disable -Werror by default unless
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 6e1c2c2d90..e3ce65b01d 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 7148ebd5c4..ce6aee09f7 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 428
+#define RUBY_PATCHLEVEL 429
#define RUBY_RELEASE_DATE "2013-05-15"
#define RUBY_RELEASE_YEAR 2013