Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / charset / charconv.h

diff --git a/charset/charconv.h b/charset/charconv.h
index cfe0a2a2985b5a3bb6d505dea7e2c0b0f793d82f..78b3ac73caa938e953c1390b25c62f2aa9d7ef8b 100644 (file)
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -1,12 +1,15 @@
 /*
  *     Character Set Conversion Library 1.2
  *
 /*
  *     Character Set Conversion Library 1.2
  *

- *     (c) 1998--2004 Martin Mares <mj@ucw.cz>
+ *     (c) 1998--2005 Martin Mares <mj@ucw.cz>

  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
  *
  *     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 */
 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_ISO_8859_15,
        CONV_CHARSET_ISO_8859_16,
        CONV_CHARSET_WIN1250,

+       CONV_CHARSET_WIN1251,

        CONV_CHARSET_WIN1252,
        CONV_CHARSET_KAMCS,
        CONV_CHARSET_CSN369103,
        CONV_CHARSET_WIN1252,
        CONV_CHARSET_KAMCS,
        CONV_CHARSET_CSN369103,


@@ -74,5 +78,7 @@ unsigned int conv_x_count(void);
 
 /* Charset names */
 
 
 /* Charset names */
 

-int find_charset_by_name(char *);
+int find_charset_by_name(const char *);

 char *charset_name(int);
 char *charset_name(int);

+
+#endif