X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fmp-charconv.h;h=5401d4f308955cd8326f057184e4a9571f910b71;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=97604983ea4320645ea74b594bf2e3d4963074e6;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h index 97604983..5401d4f3 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 -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