* include/ruby/oniguruma.h: remove ONIG_ENCODING_* and OnigEncoding*

  which are not builtin.

* regenc.{c,h} (onigenc_mb2_code_to_mbclen, onigenc_mb4_code_to_mbclen):
  fix prototype.

* enc/big5.c, enc/euc_kr.c, enc/euc_tw.c, enc/gb18030.c,
  enc/koi8_r.c, enc/windows_1251.c: imported from Oniguruma.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/regenc.c b/regenc.c
index 7bc978a09a..c581dfdbaf 100644
--- a/regenc.c
+++ b/regenc.c
@@ -712,14 +712,14 @@ onigenc_mbn_is_mbc_ambiguous(OnigEncoding enc, OnigCaseFoldType flag,
 #endif
 
 extern int
-onigenc_mb2_code_to_mbclen(OnigCodePoint code)
+onigenc_mb2_code_to_mbclen(OnigCodePoint code, OnigEncoding enc)
 {
   if ((code & 0xff00) != 0) return 2;
   else return 1;
 }
 
 extern int
-onigenc_mb4_code_to_mbclen(OnigCodePoint code)
+onigenc_mb4_code_to_mbclen(OnigCodePoint code, OnigEncoding enc)
 {
        if ((code & 0xff000000) != 0) return 4;
   else if ((code & 0xff0000) != 0) return 3;