X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=1b5f0251474d4497369ff85b8c5f82dfc91ed280;hp=2721b01efc5893a5d8b0b69cf5d10f6272ac948c;hb=c5ca8b7eaa727392811813926cda758bceef80f1;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/charset.h b/charset.h
index 2721b01..1b5f025 100644
--- a/charset.h
+++ b/charset.h
@@ -1,24 +1,21 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #ifndef _CHARSET_H
 #define _CHARSET_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mutt.h"
+
 #ifdef HAVE_ICONV_H
 #include <iconv.h>
 #endif
@@ -28,19 +25,24 @@ typedef void *iconv_t;
 #endif
 
 #ifndef HAVE_ICONV
-#define ICONV_CONST /**/
-  iconv_t iconv_open (const char *, const char *);
-size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
-int iconv_close (iconv_t);
+#  define iconv_open(a, b)     ((iconv_t)(-1))
+#  define my_iconv(a,b,c,d,e)  0
+#  define iconv_close(a)       0
+#else
+static inline ssize_t my_iconv(iconv_t ict, const char **inbuf, ssize_t *ilen,
+                               char **outbuf, ssize_t *olen)
+{
+    return iconv(ict, (char **)inbuf, (size_t*)ilen, outbuf, (size_t*)olen);
+}
 #endif
 
 int mutt_convert_string (char **, const char *, const char *, int);
-char *mutt_get_first_charset (const char *);
+const char *mutt_get_first_charset (const char *);
 int mutt_convert_nonmime_string (char **);
 
 iconv_t mutt_iconv_open (const char *, const char *, int);
-size_t mutt_iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *,
-                   ICONV_CONST char **, const char *);
+size_t mutt_iconv (iconv_t, const char **, size_t *, char **, size_t *,
+                   const char **, const char *);
 
 typedef void *FGETCONV;