summaryrefslogtreecommitdiffstats
path: root/ruby.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-01 14:05:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-01 14:05:53 +0000
commit48ee1ad5e5332c43880df966c687b0867c12fe29 (patch)
tree7db5c3fc8b13c9edd49a2a59bf7a3513c4e1fa82 /ruby.c
parent84315c9926a89580f1753ce0de9f565d93cc8388 (diff)
downloadruby-48ee1ad5e5332c43880df966c687b0867c12fe29.tar.gz
ruby-48ee1ad5e5332c43880df966c687b0867c12fe29.tar.xz
ruby-48ee1ad5e5332c43880df966c687b0867c12fe29.zip
* encoding.c: rename primary_encoding -> default_external (encoding).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ruby.c b/ruby.c
index b3d0a6c2f..05c559a5e 100644
--- a/ruby.c
+++ b/ruby.c
@@ -163,7 +163,7 @@ locale_encoding(void)
enc = rb_enc_from_index(idx);
if (enc) return enc;
}
- return rb_enc_default();
+ return rb_default_encoding();
}
extern VALUE rb_load_path;
@@ -1033,7 +1033,7 @@ process_options(VALUE arg)
else {
enc = locale_encoding();
}
- rb_set_primary_encoding(rb_enc_from_encoding(enc));
+ rb_enc_set_default_external(rb_enc_from_encoding(enc));
return (VALUE)tree;
}