From 7dc7da3d86bed37d1c9ec7331b45b418746ce65d Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 2 Sep 2011 12:11:17 +0000 Subject: * io.c (validate_enc_binmode, prep_stdio): default to text mode on dosish platforms. [ruby-core:38822] [Bug #5164] * transcode.c (rb_econv_prepare_options): keep default ecflags unchanged if no options. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- transcode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'transcode.c') diff --git a/transcode.c b/transcode.c index 4d32cf705a..5f7f856a33 100644 --- a/transcode.c +++ b/transcode.c @@ -2533,7 +2533,7 @@ rb_econv_prepare_options(VALUE opthash, VALUE *opts, int ecflags) if (NIL_P(opthash)) { *opts = Qnil; - return 0; + return ecflags; } ecflags = econv_opts(opthash, ecflags); -- cgit v1.2.3