X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2Fcharconv.h;h=78b3ac73caa938e953c1390b25c62f2aa9d7ef8b;hb=5a78c3505ae7fa76a061e26676450049ec5946d5;hp=172c3fa6f191f221740a50b7e68e8c19120dd135;hpb=0bb4ed9f0708e3b08e7f7c37cae7c765e7a01366;p=libucw.git diff --git a/charset/charconv.h b/charset/charconv.h index 172c3fa6..78b3ac73 100644 --- a/charset/charconv.h +++ b/charset/charconv.h @@ -1,12 +1,15 @@ /* * Character Set Conversion Library 1.2 * - * (c) 1998--2004 Martin Mares + * (c) 1998--2005 Martin Mares * * 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 + struct conv_context { /* Parameters supplied by the caller */ @@ -53,6 +56,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, @@ -63,7 +67,7 @@ enum charset_id { CONV_NUM_CHARSETS }; -/* Conversion of a single character between current charset to Unicode */ +/* 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); @@ -74,5 +78,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