X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fmp-charconv.h;h=8218c29a9bda95c9a97b22aab4d9458bfa0f7c14;hb=73925de8e12aaf916367f561ccffe65328ef7bf0;hp=97604983ea4320645ea74b594bf2e3d4963074e6;hpb=6653d0a752dd937152fa66f1725fab42edc25b8a;p=libucw.git diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h index 97604983..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 "ucw/mempool.h" -#include "charset/charconv.h" +#include +#include + +#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, 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); } -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