summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 20:56:24 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-22 20:56:24 +0000
commit5da9f5252effa13f9351b7ef12e0e1f8c52c4243 (patch)
treeec3c60c4ae8c3443fed0f8ae3de8dddcadc91fd2
parentb1bd8de6a62f7d8b37371b779ac7b152446bb01d (diff)
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
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--win32/win32.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index eb2dc6f271d..e4e437ca173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 23 05:55:04 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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 <nobu@ruby-lang.org>
* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
diff --git a/version.h b/version.h
index f7f8c3a5ee8..94c15db6091 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 1ca2ee41ed9..b88c136467c 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