X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fstk-charconv.h;h=e6852c7762cd75c9437af6a05d9df4ef91bcee95;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=71cdbc5149d7c3f99f786f9d6cebbd6ef6b9e1fe;hpb=a4f8b029b86d2ca1612a9c2e2795ccea27b15276;p=libucw.git diff --git a/charset/stk-charconv.h b/charset/stk-charconv.h index 71cdbc51..e6852c77 100644 --- a/charset/stk-charconv.h +++ b/charset/stk-charconv.h @@ -21,7 +21,7 @@ /* The following macros convert strings between given charsets (CONV_CHARSET_x). */ #define stk_strconv(s, cs_in, cs_out) \ - ({ struct conv_context _c; uns _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \ + ({ struct conv_context _c; uint _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \ while (_l) _l=stk_strconv_step(&_c, alloca(_l), _l); _c.dest_start; }) #define stk_strconv_to_utf8(s, cs_in) stk_strconv(s, cs_in, CONV_CHARSET_UTF8) @@ -29,7 +29,7 @@ /* Internals */ -uns stk_strconv_init(struct conv_context *c, const byte *s, uns cs_in, uns cs_out); -uns stk_strconv_step(struct conv_context *c, byte *buf, uns len); +uint stk_strconv_init(struct conv_context *c, const byte *s, uint cs_in, uint cs_out); +uint stk_strconv_step(struct conv_context *c, byte *buf, uint len); #endif