X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=charset%2Fcharconv.h;h=bf604a078cf9d51f982e2602a328fa598d097915;hb=d9c55a4d021b4a317a25f14f89468d62592aae0b;hp=ed775b137b0e26cf27c2fa893f87452aedbaf1f1;hpb=47a0795e8a28e8ad6ff55cda89e300267d9e590c;p=libucw.git

diff --git a/charset/charconv.h b/charset/charconv.h
index ed775b13..bf604a07 100644
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -2,6 +2,7 @@
  *	Character Set Conversion Library 1.2
  *
  *	(c) 1998--2005 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <pchar@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -10,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 */
@@ -64,6 +77,8 @@ enum charset_id {
 	CONV_CHARSET_MACCE,
 	CONV_CHARSET_CORK,
 	CONV_CHARSET_UTF8,
+	CONV_CHARSET_UTF16_BE,
+	CONV_CHARSET_UTF16_LE,
 	CONV_NUM_CHARSETS
 };
 
@@ -78,7 +93,7 @@ unsigned int conv_x_count(void);
 
 /* Charset names */
 
-int find_charset_by_name(char *);
+int find_charset_by_name(const char *);
 char *charset_name(int);
 
 #endif