X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fstk-charconv.h;h=e6852c7762cd75c9437af6a05d9df4ef91bcee95;hb=a6368763d08042207963c941b1c52b5fafcb0cb3;hp=154edacfff77ca4898bf374af5da6594ec4db855;hpb=fa7aa6d9457616ce28f97c83eaa616d0ff276870;p=libucw.git

diff --git a/charset/stk-charconv.h b/charset/stk-charconv.h
index 154edacf..e6852c77 100644
--- a/charset/stk-charconv.h
+++ b/charset/stk-charconv.h
@@ -13,10 +13,15 @@
 #include <charset/charconv.h>
 #include <alloca.h>
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define stk_strconv_init ucw_stk_strconv_init
+#define stk_strconv_step ucw_stk_strconv_step
+#endif
+
 /* 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)
@@ -24,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