3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index decfdcba58..85975bd571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 10 10:53:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
+	  [ ruby-Bugs-16948 ]
+
 Tue Jan  8 20:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win{32,ce}/Makefile.sub: merged.
diff --git a/version.h b/version.h
index 2be5267b4f..529f06a2c7 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-01-08"
+#define RUBY_RELEASE_DATE "2008-01-10"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080108
+#define RUBY_RELEASE_CODE 20080110
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 10
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
diff --git a/win32/win32.c b/win32/win32.c
index 74a6a7f4b6..3c16e57df1 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1836,7 +1836,7 @@ init_stdhandle(void)
 
 #ifdef __BORLANDC__
 static int
-rb_w32_open_osfhandle(intptr_t osfhandle, int flags)
+rb_w32_open_osfhandle(long osfhandle, int flags)
 {
     int fd = _open_osfhandle(osfhandle, flags);
     if (fd == -1) {