X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fmp-charconv.h;h=8218c29a9bda95c9a97b22aab4d9458bfa0f7c14;hb=0b7df598070533b746e6162e53f90af764bd8f83;hp=f33cd373e590620a7ceb9e6051d3b166fc89952c;hpb=b6a5054473b03660664647866d41601431e83b07;p=libucw.git

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index f33cd373..8218c29a 100644
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -10,17 +10,19 @@
 #ifndef _CHARSET_MP_CHARCONV_H
 #define _CHARSET_MP_CHARCONV_H
 
-#include "lib/mempool.h"
-#include "charset/charconv.h"
+#include <ucw/mempool.h>
+#include <charset/charconv.h>
 
-byte *mp_strconv(struct mempool *mp, 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, uns cs_in, uns cs_out);
 
-static inline byte *
-mp_strconv_to_utf8(struct mempool *mp, 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); }
 
-static inline byte *
-mp_strconv_from_utf8(struct mempool *mp, 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