X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fcharconv.h;h=bec228f24b63123e67b64e53056c224f0f0b0603;hb=9adf0cac23ff0639f64a9d510c71e5aab44c27e9;hp=172c3fa6f191f221740a50b7e68e8c19120dd135;hpb=0bb4ed9f0708e3b08e7f7c37cae7c765e7a01366;p=libucw.git

diff --git a/charset/charconv.h b/charset/charconv.h
index 172c3fa6..bec228f2 100644
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -1,12 +1,28 @@
 /*
  *	Character Set Conversion Library 1.2
  *
- *	(c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *	(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.
  */
 
+#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 */
@@ -23,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;
 };
 
@@ -53,6 +69,7 @@ enum charset_id {
 	CONV_CHARSET_ISO_8859_15,
 	CONV_CHARSET_ISO_8859_16,
 	CONV_CHARSET_WIN1250,
+	CONV_CHARSET_WIN1251,
 	CONV_CHARSET_WIN1252,
 	CONV_CHARSET_KAMCS,
 	CONV_CHARSET_CSN369103,
@@ -60,19 +77,23 @@ enum charset_id {
 	CONV_CHARSET_MACCE,
 	CONV_CHARSET_CORK,
 	CONV_CHARSET_UTF8,
+	CONV_CHARSET_UTF16_BE,
+	CONV_CHARSET_UTF16_LE,
 	CONV_NUM_CHARSETS
 };
 
-/* Conversion of a single character between current charset to 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);
+/* Conversion of a single character between current non-UTF8 charset and Unicode */
+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 */
 
-int find_charset_by_name(char *);
+int find_charset_by_name(const char *);
 char *charset_name(int);
+
+#endif