merge -r 12278:12280

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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index eb2dc6f271..e4e437ca17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 23 05:55:04 2007  NAKAMURA Usaku  <[email protected]>
+
+	* win32/win32.c (init_stdhandle): stderr should be without buffering,
+	  but mswin32 use buffering when stderr is not connected to tty.
+
 Wed May 23 03:33:55 2007  Nobuyoshi Nakada  <[email protected]>
 
 	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
diff --git a/version.h b/version.h
index f7f8c3a5ee..94c15db609 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-05-23"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070523
-#define RUBY_PATCHLEVEL 46
+#define RUBY_PATCHLEVEL 47
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index 1ca2ee41ed..b88c136467 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1763,6 +1763,7 @@ init_stdhandle(void)
     if (fileno(stderr) < 0) {
 	stderr->_file = 2;
     }
+    setvbuf(stderr, NULL, _IONBF, 0);
 }
 #else