3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eea1344842..d6b838bc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Thu Jul 9 11:22:00 2009 Kirk Haines <khaines@ruby-lang.org>
+Fri Jul 10 04:00:00 2009 Kirk Haines <khaines@ruby-lang.org>
+
+	* file.c: Added FCNTL inclusion to fix a compile error with solaris (backport from r22812)
+
+Thu Jul  9 11:22:00 2009 Kirk Haines <khaines@ruby-lang.org>
 
 	* gc.c: Add a check for DATA_PTR(obj) to run_final as a stopgap fix for debilitating segfaults.
 
diff --git a/file.c b/file.c
index 16ef2c9028..543d881298 100644
--- a/file.c
+++ b/file.c
@@ -71,6 +71,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 c8c09c246c..238d28c8a5 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090608
-#define RUBY_PATCHLEVEL 376
+#define RUBY_PATCHLEVEL 377
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8