diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-28 13:18:52 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-28 13:18:52 +0000 |
commit | 7b3878e1d0b535184f4a82ddd0b4cf08f1c51558 (patch) | |
tree | 406b6a7e80384c708f1cc08aeaf431510edf825b /spec | |
parent | efd36e71045228c1dcdffda36636bcd80c8e604c (diff) |
rb_enc_alias
`rb_encdb`-prefixed functions are only for internal use.
use rb_enc_alias instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r-- | spec/ruby/optional/capi/encoding_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/optional/capi/ext/encoding_spec.c | 13 | ||||
-rw-r--r-- | spec/ruby/optional/capi/ext/rubyspec.h | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/spec/ruby/optional/capi/encoding_spec.rb b/spec/ruby/optional/capi/encoding_spec.rb index cd3f00d478..dc1019e8ae 100644 --- a/spec/ruby/optional/capi/encoding_spec.rb +++ b/spec/ruby/optional/capi/encoding_spec.rb @@ -37,9 +37,9 @@ describe "C-API Encoding function" do @s = CApiEncodingSpecs.new end - describe "rb_encdb_alias" do + describe "rb_enc_alias" do it "creates an alias for an existing Encoding" do - @s.rb_encdb_alias("ZOMGWTFBBQ", "UTF-8").should >= 0 + @s.rb_enc_alias("ZOMGWTFBBQ", "UTF-8").should >= 0 Encoding.find("ZOMGWTFBBQ").name.should == "UTF-8" end end diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c index 6f4057865b..9ab893b86a 100644 --- a/spec/ruby/optional/capi/ext/encoding_spec.c +++ b/spec/ruby/optional/capi/ext/encoding_spec.c @@ -93,12 +93,9 @@ static VALUE encoding_spec_rb_default_external_encoding(VALUE self) { } #endif -#ifdef HAVE_RB_ENCDB_ALIAS -/* Not exposed by MRI C-API encoding.h but used in the pg gem. */ -extern int rb_encdb_alias(const char* alias, const char* orig); - -static VALUE encoding_spec_rb_encdb_alias(VALUE self, VALUE alias, VALUE orig) { - return INT2NUM(rb_encdb_alias(RSTRING_PTR(alias), RSTRING_PTR(orig))); +#ifdef HAVE_RB_ENC_ALIAS +static VALUE encoding_spec_rb_enc_alias(VALUE self, VALUE alias, VALUE orig) { + return INT2NUM(rb_enc_alias(RSTRING_PTR(alias), RSTRING_PTR(orig))); } #endif @@ -326,8 +323,8 @@ void Init_encoding_spec(void) { encoding_spec_rb_default_external_encoding, 0); #endif -#ifdef HAVE_RB_ENCDB_ALIAS - rb_define_method(cls, "rb_encdb_alias", encoding_spec_rb_encdb_alias, 2); +#ifdef HAVE_RB_ENC_ALIAS + rb_define_method(cls, "rb_enc_alias", encoding_spec_rb_enc_alias, 2); #endif #ifdef HAVE_RB_ENC_ASSOCIATE diff --git a/spec/ruby/optional/capi/ext/rubyspec.h b/spec/ruby/optional/capi/ext/rubyspec.h index 4f50450dfb..1ece9541c7 100644 --- a/spec/ruby/optional/capi/ext/rubyspec.h +++ b/spec/ruby/optional/capi/ext/rubyspec.h @@ -204,7 +204,7 @@ #define HAVE_RB_DEFAULT_INTERNAL_ENCODING 1 #define HAVE_RB_DEFAULT_EXTERNAL_ENCODING 1 -#define HAVE_RB_ENCDB_ALIAS 1 +#define HAVE_RB_ENC_ALIAS 1 #define HAVE_RB_ENC_ASSOCIATE 1 #define HAVE_RB_ENC_ASSOCIATE_INDEX 1 #define HAVE_RB_ENC_CODEPOINT_LEN 1 |