diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 13:36:18 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 13:36:18 +0000 |
| commit | 936abb91896fb2770880ee8796342cf8c996aa3e (patch) | |
| tree | e7ed05f4840d0eb293ad4420c212debca496a2b0 /enc/utf_32be.c | |
| parent | 804db5983a319570fdf526617ff3f96ec3fad34a (diff) | |
| download | ruby-936abb91896fb2770880ee8796342cf8c996aa3e.tar.gz ruby-936abb91896fb2770880ee8796342cf8c996aa3e.tar.xz ruby-936abb91896fb2770880ee8796342cf8c996aa3e.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/utf_32be.c')
| -rw-r--r-- | enc/utf_32be.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/enc/utf_32be.c b/enc/utf_32be.c index 1528b8980..5f8c2a3ec 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); } |