summaryrefslogtreecommitdiff
path: root/miniinit.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 15:26:53 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 15:26:53 +0000
commitdc4286a134a7ca882f92841cdc444d07fb647786 (patch)
tree08a8d474955ae8dfcdda0baadfb9f630690370fd /miniinit.c
parent69dc2ce6640ac71b24e6e4a2b7bb42f058cfa809 (diff)
merge revision(s) 53315: [Backport #11872]
* miniinit.c (Init_enc): add some common aliases of built-in encodings. [ruby-core:72481] [Bug #11872] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'miniinit.c')
-rw-r--r--miniinit.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/miniinit.c b/miniinit.c
index b4bc4dd437..7284e2e62d 100644
--- a/miniinit.c
+++ b/miniinit.c
@@ -36,11 +36,14 @@ Init_enc_set_filesystem_encoding(void)
return rb_enc_to_index(rb_default_external_encoding());
}
+void rb_encdb_declare(const char *name);
+int rb_encdb_alias(const char *alias, const char *orig);
void
Init_enc(void)
{
- void rb_encdb_declare(const char *name);
rb_encdb_declare("ASCII-8BIT");
rb_encdb_declare("US-ASCII");
rb_encdb_declare("UTF-8");
+ rb_encdb_alias("BINARY", "ASCII-8BIT");
+ rb_encdb_alias("ASCII", "US-ASCII");
}