diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 11:51:55 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-27 11:51:55 +0000 |
commit | 9369118f8f4ed02c76839c6a67c268a2de9acde9 (patch) | |
tree | 1c5e7235b590e1431f70ab743b4ac7314c7a0d81 /ext/nkf | |
parent | b7111d382c16ee89dae3c19c756ce2272190d55a (diff) |
Merge changes between r11871 and r11907 from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf')
-rw-r--r-- | ext/nkf/nkf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 8eb92b6cd6..2bb0340a64 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -63,7 +63,7 @@ rb_nkf_putchar(c) o_len += incsize; rb_str_resize(result, o_len); incsize *= 2; - output = RSTRING(result)->ptr; + output = (unsigned char *)RSTRING(result)->ptr; } output[output_ctr++] = c; @@ -158,13 +158,13 @@ rb_nkf_kconv(obj, opt, src) input_ctr = 0; StringValue(src); - input = RSTRING(src)->ptr; + input = (unsigned char *)RSTRING(src)->ptr; i_len = RSTRING(src)->len; result = rb_str_new(0, i_len*3 + 10); v = result; output_ctr = 0; - output = RSTRING(result)->ptr; + output = (unsigned char *)RSTRING(result)->ptr; o_len = RSTRING(result)->len; *output = '\0'; @@ -213,7 +213,7 @@ rb_nkf_guess1(obj, src) int sequence_counter = 0; StringValue(src); - p = RSTRING(src)->ptr; + p = (unsigned char *)RSTRING(src)->ptr; pend = p + RSTRING(src)->len; if (p == pend) return INT2FIX(_UNKNOWN); @@ -328,7 +328,7 @@ rb_nkf_guess2(obj, src) input_ctr = 0; StringValue(src); - input = RSTRING(src)->ptr; + input = (unsigned char *)RSTRING(src)->ptr; i_len = RSTRING(src)->len; if(x0201_f == WISH_TRUE) |