diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-28 14:18:56 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-28 14:18:56 +0000 |
| commit | 4aaceb29bc8b43136e802f2891f9b08334f09d13 (patch) | |
| tree | 690f3bc3d627b0cda15453e10e78aaabd17980c4 /spec/ruby/optional/capi/ext/encoding_spec.c | |
| parent | 7c9fa8f9bba6760185115204db73c1371e047f6b (diff) | |
Revert "rb_enc_alias"
This reverts commit r63779 which made test-spec fail.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/optional/capi/ext/encoding_spec.c')
| -rw-r--r-- | spec/ruby/optional/capi/ext/encoding_spec.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/spec/ruby/optional/capi/ext/encoding_spec.c b/spec/ruby/optional/capi/ext/encoding_spec.c index 9ab893b86a..6f4057865b 100644 --- a/spec/ruby/optional/capi/ext/encoding_spec.c +++ b/spec/ruby/optional/capi/ext/encoding_spec.c @@ -93,9 +93,12 @@ static VALUE encoding_spec_rb_default_external_encoding(VALUE self) { } #endif -#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))); +#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))); } #endif @@ -323,8 +326,8 @@ void Init_encoding_spec(void) { encoding_spec_rb_default_external_encoding, 0); #endif -#ifdef HAVE_RB_ENC_ALIAS - rb_define_method(cls, "rb_enc_alias", encoding_spec_rb_enc_alias, 2); +#ifdef HAVE_RB_ENCDB_ALIAS + rb_define_method(cls, "rb_encdb_alias", encoding_spec_rb_encdb_alias, 2); #endif #ifdef HAVE_RB_ENC_ASSOCIATE |