Merge branch 'dev-api' into dev-package

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

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index a51e05e70f01ab17c79afe13b1d58d1d681c8435..8218c29a9bda95c9a97b22aab4d9458bfa0f7c14 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -13,14 +13,16 @@
 #include <ucw/mempool.h>
 #include <charset/charconv.h>
 
 #include <ucw/mempool.h>
 #include <charset/charconv.h>
 

+#ifdef CONFIG_UCW_CLEAN_ABI
+#define mp_strconv ucw_mp_strconv
+#endif
+

 byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out);
 
 byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns 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, uns cs_in)

 { return mp_strconv(mp, s, cs_in, CONV_CHARSET_UTF8); }
 
 { 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, uns cs_out)

 { return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif
 { return mp_strconv(mp, s, CONV_CHARSET_UTF8, cs_out); }
 
 #endif