Merge branch 'dev-table'

[libucw.git] / charset / mp-charconv.h

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index a51e05e70f01ab17c79afe13b1d58d1d681c8435..5401d4f308955cd8326f057184e4a9571f910b71 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -13,14 +13,16 @@
 #include <ucw/mempool.h>
 #include <charset/charconv.h>
 
-byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out);
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define mp_strconv ucw_mp_strconv
+#endif
+
+byte *mp_strconv(struct mempool *mp, const byte *s, uint cs_in, uint cs_out);
 
-static inline byte *
-mp_strconv_to_utf8(struct mempool *mp, const byte *s, uns cs_in)
+static inline byte *mp_strconv_to_utf8(struct mempool *mp, const byte *s, uint cs_in)
 { return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
 
-static inline byte *
-mp_strconv_from_utf8(struct mempool *mp, const byte *s, uns cs_out)
+static inline byte *mp_strconv_from_utf8(struct mempool *mp, const byte *s, uint cs_out)
 { return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif