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/euc_jp.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/euc_jp.c')
-rw-r--r-- | enc/euc_jp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/enc/euc_jp.c b/enc/euc_jp.c index fbf3848f47..31422a5f77 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -139,7 +139,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) int c, i, len; OnigCodePoint n; - len = enclen(&encoding_EUC_JP, p, end); + len = enclen(&OnigEncodingName(EUC_JP), p, end); n = (OnigCodePoint )*p++; if (len == 1) return n; @@ -191,7 +191,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) *p++ = (UChar )(code & 0xff); #if 1 - if (enclen(&encoding_EUC_JP, buf, p) != (p - buf)) + if (enclen(&OnigEncodingName(EUC_JP), buf, p) != (p - buf)) return ONIGERR_INVALID_CODE_POINT_VALUE; #endif return p - buf; @@ -213,7 +213,7 @@ mbc_case_fold(OnigCaseFoldType flag, else { int i; - len = enclen(&encoding_EUC_JP, p, end); + len = enclen(&OnigEncodingName(EUC_JP), p, end); for (i = 0; i < len; i++) { *lower++ = *p++; } @@ -235,7 +235,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) p = s; while (!eucjp_islead(*p) && p > start) p--; - len = enclen(&encoding_EUC_JP, p, s); + len = enclen(&OnigEncodingName(EUC_JP), p, s); if (p + len > s) return (UChar* )p; p += len; return (UChar* )(p + ((s - p) & ~1)); |