/*
- * Sherlock Library -- Character Conversion with Allocation on the Stack
+ * Sherlock Library -- Character Conversion with Allocation on the Stack
*
* (c) 2006 Pavel Charvat <pchar@ucw.cz>
*
#ifndef _CHARSET_STK_CHARCONV_H
#define _CHARSET_STK_CHARCONV_H
-#include "charset/charconv.h"
+#include <charset/charconv.h>
#include <alloca.h>
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define stk_strconv_init ucw_stk_strconv_init
+#define stk_strconv_step ucw_stk_strconv_step
+#endif
+
/* The following macros convert strings between given charsets (CONV_CHARSET_x). */
#define stk_strconv(s, cs_in, cs_out) \
- ({ struct conv_context _c; uns _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \
+ ({ struct conv_context _c; uint _l=stk_strconv_init(&_c, (s), (cs_in), (cs_out)); \
while (_l) _l=stk_strconv_step(&_c, alloca(_l), _l); _c.dest_start; })
#define stk_strconv_to_utf8(s, cs_in) stk_strconv(s, cs_in, CONV_CHARSET_UTF8)
#define stk_strconv_from_utf8(s, cs_out) stk_strconv(s, CONV_CHARSET_UTF8, cs_out)
-
+
/* Internals */
-uns stk_strconv_init(struct conv_context *c, byte *s, uns cs_in, uns cs_out);
-uns stk_strconv_step(struct conv_context *c, byte *buf, uns len);
+uint stk_strconv_init(struct conv_context *c, const byte *s, uint cs_in, uint cs_out);
+uint stk_strconv_step(struct conv_context *c, byte *buf, uint len);
#endif