merge revision(s) 22812:

	* file.c: include fcntl.h for O_RDONLY on Solaris.


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

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c9734b391a..28b0ad1de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  3 21:16:30 2009  Tanaka Akira  <akr@fsij.org>
+
+	* file.c: include fcntl.h for O_RDONLY on Solaris.
+
 Wed Jun  3 21:09:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (rv_strdup): macro to duplicate nul-terminated string.
diff --git a/file.c b/file.c
index 50d2d3f99f..72700a6a10 100644
--- a/file.c
+++ b/file.c
@@ -68,6 +68,10 @@ char *strrchr _((const char*,const char));
 #include <sys/mkdev.h>
 #endif
 
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat
 #endif
diff --git a/version.h b/version.h
index 59870c4e55..448b1d8bdb 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-06-03"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090603
-#define RUBY_PATCHLEVEL 170
+#define RUBY_PATCHLEVEL 171
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8