XTypes: Fixed dump of configuration.

[libucw.git] / charset / charconv.h

diff --git a/charset/charconv.h b/charset/charconv.h
index ba695ac9ed13c9cdf2d7656fff71a2f4b67e0461..bec228f24b63123e67b64e53056c224f0f0b0603 100644 (file)
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -11,6 +11,18 @@
 #ifndef _CHARSET_CHARCONV_H
 #define _CHARSET_CHARCONV_H
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define charset_name ucw_charset_name
+#define conv_in_to_ucs ucw_conv_in_to_ucs
+#define conv_init ucw_conv_init
+#define conv_set_charset ucw_conv_set_charset
+#define conv_ucs_to_out ucw_conv_ucs_to_out
+#define conv_ucs_to_x ucw_conv_ucs_to_x
+#define conv_x_count ucw_conv_x_count
+#define conv_x_to_ucs ucw_conv_x_to_ucs
+#define find_charset_by_name ucw_find_charset_by_name
+#endif
+
 struct conv_context {
 
   /* Parameters supplied by the caller */
@@ -27,7 +39,7 @@ struct conv_context {
   int source_charset, dest_charset;
   unsigned short int *in_to_x;
   unsigned short int *x_to_out;
-  unsigned int state, code, remains;
+  uint state, code, remains;
   unsigned char *string_at;
 };
 
@@ -71,13 +83,13 @@ enum charset_id {
 };
 
 /* Conversion of a single character between current non-UTF8 charset and Unicode */
-int conv_in_to_ucs(struct conv_context *c, unsigned int y);
-int conv_ucs_to_out(struct conv_context *c, unsigned int ucs);
+int conv_in_to_ucs(struct conv_context *c, uint y);
+int conv_ucs_to_out(struct conv_context *c, uint ucs);
 
 /* For those brave ones who want to mess with charconv internals */
-unsigned int conv_x_to_ucs(unsigned int x);
-unsigned int conv_ucs_to_x(unsigned int ucs);
-unsigned int conv_x_count(void);
+uint conv_x_to_ucs(uint x);
+uint conv_ucs_to_x(uint ucs);
+uint conv_x_count(void);
 
 /* Charset names */