summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-02 12:11:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-02 12:11:17 +0000
commit7dc7da3d86bed37d1c9ec7331b45b418746ce65d (patch)
tree3336a76779a5986a240d30045ff1fef5a4282857 /transcode.c
parent45fffaeac83cff2e5e09fbf34d39033f65c0784d (diff)
downloadruby-7dc7da3d86bed37d1c9ec7331b45b418746ce65d.tar.gz
* 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
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c2
1 files changed, 1 insertions, 1 deletions
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);