* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed

  warnings.

* regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
  encoding argument.

* enc/utf{16,32}_{be,le}.c: added init functions.


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

5 files changed, 6 insertions, 5 deletions

diff --git a/enc/unicode.c b/enc/unicode.c
index 4642bbe5c1..126588f3fb 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -10781,7 +10781,8 @@ onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
 
 extern int
 onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-                                      const OnigCodePoint* ranges[])
+                                      const OnigCodePoint* ranges[],
+				      struct OnigEncodingTypeST* enc ARG_UNUSED)
 {
   *sb_out = 0x00;
   return onigenc_unicode_ctype_code_range(ctype, ranges);
diff --git a/enc/utf16_be.c b/enc/utf16_be.c
index 5d98151706..0c64a46468 100644
--- a/enc/utf16_be.c
+++ b/enc/utf16_be.c
@@ -217,7 +217,7 @@ utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF16_BE = {
+OnigEncodingDefine(utf16_be, UTF16_BE) = {
   utf16be_mbc_enc_len,
   "UTF-16BE",   /* name */
   4,            /* max byte length */
diff --git a/enc/utf16_le.c b/enc/utf16_le.c
index 7b50b8481a..f16a7cdca5 100644
--- a/enc/utf16_le.c
+++ b/enc/utf16_le.c
@@ -218,7 +218,7 @@ utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF16_LE = {
+OnigEncodingDefine(utf16_le, UTF16_LE) = {
   utf16le_mbc_enc_len,
   "UTF-16LE",   /* name */
   4,            /* max byte length */
diff --git a/enc/utf32_be.c b/enc/utf32_be.c
index 7ebf1a2eaf..c50e3871d4 100644
--- a/enc/utf32_be.c
+++ b/enc/utf32_be.c
@@ -173,7 +173,7 @@ utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF32_BE = {
+OnigEncodingDefine(utf32_be, UTF32_BE) = {
   utf32be_mbc_enc_len,
   "UTF-32BE",   /* name */
   4,            /* max byte length */
diff --git a/enc/utf32_le.c b/enc/utf32_le.c
index 0d443f1b75..9aaff4926d 100644
--- a/enc/utf32_le.c
+++ b/enc/utf32_le.c
@@ -173,7 +173,7 @@ utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 						    flag, p, end, items);
 }
 
-OnigEncodingType OnigEncodingUTF32_LE = {
+OnigEncodingDefine(utf32_le, UTF32_LE) = {
   utf32le_mbc_enc_len,
   "UTF-32LE",   /* name */
   4,            /* max byte length */