merges r22707 from trunk into ruby_1_9_1.

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

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

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 07f79f5ed2..bd8dfc7eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  2 21:01:36 2009  Tanaka Akira  <akr@fsij.org>
+
+	* file.c: include fcntl.h for O_RDONLY on Solaris.
+
 Mon Mar  2 19:43:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/uri/common.rb (URI::Parser#escape): escaped string is ascii
diff --git a/file.c b/file.c
index 642ea82499..6a7cabae79 100644
--- a/file.c
+++ b/file.c
@@ -62,6 +62,10 @@ int flock(int, int);
 #include <sys/mkdev.h>
 #endif
 
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat
 #endif