From e86bf2db4585eb89924419ec3fe84945df74d386 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 18 Feb 2011 10:47:31 +0000 Subject: merge revision(s) 30604: * win32/win32.c (init_stdhandle): backport mistake of r29382. some code are needless in ruby 1.8. [ruby-core:34579] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 2 +- win32/win32.c | 9 --------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 522c11a157..341d69a89f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 18 19:46:46 2011 NAKAMURA Usaku + + * win32/win32.c (init_stdhandle): backport mistake of r29382. + some code are needless in ruby 1.8. + [ruby-core:34579] + Fri Feb 18 19:22:17 2011 URABE Shyouhei * configure.in: revert revision r29854. This revision introduced diff --git a/version.h b/version.h index 2a62fa64ef..777b674e4b 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2011-02-18" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20110218 -#define RUBY_PATCHLEVEL 331 +#define RUBY_PATCHLEVEL 332 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/win32.c b/win32/win32.c index 1f8a845818..bcd8b5bf62 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1894,21 +1894,12 @@ init_stdhandle(void) if (fileno(stdin) < 0) { stdin->_file = open_null(0); } - else { - setmode(fileno(stdin), O_BINARY); - } if (fileno(stdout) < 0) { stdout->_file = open_null(1); } - else { - setmode(fileno(stdout), O_BINARY); - } if (fileno(stderr) < 0) { stderr->_file = open_null(2); } - else { - setmode(fileno(stderr), O_BINARY); - } if (nullfd >= 0 && !keep) close(nullfd); setvbuf(stderr, NULL, _IONBF, 0); } -- cgit v1.2.3