From 80bdf11432ccd8eaa7b0ec7989eef6c25bfb2a3a Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 29 Mar 2006 01:12:22 +0000 Subject: * ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar, e2w_conv): support C90 compiler. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/nkf/nkf-utf8/nkf.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ab20977a..52e8057b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 29 10:07:44 2006 NAKAMURA Usaku + + * ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar, + e2w_conv): support C90 compiler. + Wed Mar 29 06:48:40 2006 Yukihiro Matsumoto * eval.c (backtrace): reports aliased method names in a generated diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index a9498dc15..1677f4f96 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -3324,8 +3324,8 @@ nkf_each_char_to_hex(f, c) int c; { const char *hex = "0123456789ABCDEF"; - c &= 0x00FFFFFF; int shift = 20; + c &= 0x00FFFFFF; while(shift >= 0){ if(c >= 1<= 0){ @@ -3414,10 +3414,10 @@ void encode_fallback_subchar(c) int c; { + int shift = 16; c = unicode_subchar; (*oconv)((c>>8)&0xFF, c&0xFF); return; - int shift = 16; while(shift >= 0){ if(c >= 1<= 0){ @@ -3446,10 +3446,10 @@ e2w_conv(c2, c1) p = euc_to_utf8_1byte; #ifdef X0212_ENABLE } else if (c2 >> 8 == 0x8f){ + extern const unsigned short *const x0212_to_utf8_2bytes[]; if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22 && c1 == 0x43){ return 0xA6; } - extern const unsigned short *const x0212_to_utf8_2bytes[]; c2 = (c2&0x7f) - 0x21; if (0<=c2 && c2