Opt: strdup -> xstrdup

[libucw.git] / charset / charconv.h

diff --git a/charset/charconv.h b/charset/charconv.h
index d14493c16b8c241f27aa90280e15865cc2dd8024..ba695ac9ed13c9cdf2d7656fff71a2f4b67e0461 100644 (file)
--- a/charset/charconv.h
+++ b/charset/charconv.h
@@ -2,13 +2,14 @@
  *     Character Set Conversion Library 1.2
  *
  *     (c) 1998--2005 Martin Mares <mj@ucw.cz>
  *     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.
  */
 
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 

-#ifndef _CHARCONV_H
-#define _CHARCONV_H
+#ifndef _CHARSET_CHARCONV_H
+#define _CHARSET_CHARCONV_H

 
 struct conv_context {
 
 
 struct conv_context {
 


@@ -64,6 +65,8 @@ enum charset_id {
        CONV_CHARSET_MACCE,
        CONV_CHARSET_CORK,
        CONV_CHARSET_UTF8,
        CONV_CHARSET_MACCE,
        CONV_CHARSET_CORK,
        CONV_CHARSET_UTF8,

+       CONV_CHARSET_UTF16_BE,
+       CONV_CHARSET_UTF16_LE,

        CONV_NUM_CHARSETS
 };
 
        CONV_NUM_CHARSETS
 };
 


@@ -78,7 +81,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);
 
 #endif
 char *charset_name(int);
 
 #endif