Permalink
Browse files

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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@30902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent c13ff8b commit cc571164f8208d3626b02da1af6b3c593908c531 @shyouhei shyouhei committed Feb 18, 2011
Showing with 7 additions and 10 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 version.h
  3. +0 −9 win32/win32.c
View
@@ -1,3 +1,9 @@
+Fri Feb 18 19:46:46 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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 <shyouhei@ruby-lang.org>
* configure.in: revert revision r29854. This revision introduced
View
@@ -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
View
@@ -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);
}

0 comments on commit cc57116

Please sign in to comment.