X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fcharconv.h;h=bf604a078cf9d51f982e2602a328fa598d097915;hb=d9c55a4d021b4a317a25f14f89468d62592aae0b;hp=9685e77f55878ae5d72af7f9bca42affcd2ffd14;hpb=fece0021c9d669b6e0175906d0137a857b4bf4a9;p=libucw.git

diff --git a/charset/charconv.h b/charset/charconv.h
index 9685e77f..bf604a07 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 */
@@ -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,9 +77,15 @@ 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 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);
+
 /* 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);
@@ -70,5 +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