* encoding.c (ENC_REGISTER): use &OnigEncoding*.

  (ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8.
  (rb_enc_init): use ENC_REGISTER.

* include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8):
  removed.

* enc/*.c: remove use of &encoding_*; use enc argument instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 4 deletions

diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index 1528b8980c..5f8c2a3ece 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -29,8 +29,6 @@
 
 #include "regenc.h"
 
-OnigEncodingDeclare(UTF_32BE);
-
 static int
 utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
 		    struct OnigEncodingTypeST* enc ARG_UNUSED)
@@ -116,7 +114,7 @@ utf32be_mbc_case_fold(OnigCaseFoldType flag,
     return 4;
   }
   else
-    return onigenc_unicode_mbc_case_fold(&OnigEncodingName(UTF_32BE), flag, pp,
+    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
 					 end, fold);
 }
 
@@ -171,7 +169,7 @@ utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				   OnigCaseFoldCodeItem items[],
 				   struct OnigEncodingTypeST* enc ARG_UNUSED)
 {
-  return onigenc_unicode_get_case_fold_codes_by_str(&OnigEncodingName(UTF_32BE),
+  return onigenc_unicode_get_case_fold_codes_by_str(enc,
 						    flag, p, end, items);
 }