diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-13 17:16:09 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-13 17:16:09 +0000 |
commit | 8f15b8128cf47ff679d4f0d3767605d0d0afcc3c (patch) | |
tree | 643bd4938ff2bccdecdb8e63702ce8bd4e55a10a /enc/shift_jis.c | |
parent | 21671b558cfd8d90647f40a8594fd9e6db038768 (diff) | |
download | ruby-8f15b8128cf47ff679d4f0d3767605d0d0afcc3c.tar.gz |
* 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
Diffstat (limited to 'enc/shift_jis.c')
-rw-r--r-- | enc/shift_jis.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/enc/shift_jis.c b/enc/shift_jis.c index 977f2f2cce..ebfc9af5d5 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -152,7 +152,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) int c, i, len; OnigCodePoint n; - len = enclen(&encoding_Shift_JIS, p, end); + len = enclen(&OnigEncodingName(Shift_JIS), p, end); c = *p++; n = c; if (len == 1) return n; @@ -174,7 +174,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) *p++ = (UChar )(code & 0xff); #if 0 - if (enclen(&encoding_Shift_JIS, buf) != (p - buf)) + if (enclen(&OnigEncodingName(Shift_JIS), buf) != (p - buf)) return REGERR_INVALID_CODE_POINT_VALUE; #endif return p - buf; @@ -194,7 +194,7 @@ mbc_case_fold(OnigCaseFoldType flag, } else { int i; - int len = enclen(&encoding_Shift_JIS, p, end); + int len = enclen(&OnigEncodingName(Shift_JIS), p, end); for (i = 0; i < len; i++) { *lower++ = *p++; @@ -209,7 +209,7 @@ static int is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) { - return onigenc_mbn_is_mbc_ambiguous(&encoding_Shift_JIS, flag, pp, end); + return onigenc_mbn_is_mbc_ambiguous(&OnigEncodingName(Shift_JIS), flag, pp, end); } #endif @@ -247,7 +247,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) } } } - len = enclen(&encoding_Shift_JIS, p, s); + len = enclen(&OnigEncodingName(Shift_JIS), p, s); if (p + len > s) return (UChar* )p; p += len; return (UChar* )(p + ((s - p) & ~1)); |