X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstriconveha.h;h=792e6a8ba75916fdf226f2b2b6d5dae23bc076c9;hb=385b9f9d098b636827593dbd0f813c2b6858b308;hp=6f28e51f5f179c548108b1dda8eb82e7cec0f27c;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/striconveha.h b/lib/striconveha.h
index 6f28e51f5..792e6a8ba 100644
--- a/lib/striconveha.h
+++ b/lib/striconveha.h
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2011 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,8 +19,9 @@
 #define _STRICONVEHA_H
 
 #include <stdbool.h>
+#include <stddef.h>
 
-#include "striconveh.h"
+#include "iconveh.h"
 
 
 #ifdef __cplusplus
@@ -47,11 +48,11 @@ extern "C" {
    unchanged if no dynamic memory allocation was necessary.  */
 extern int
        mem_iconveha (const char *src, size_t srclen,
-		     const char *from_codeset, const char *to_codeset,
-		     bool transliterate,
-		     enum iconv_ilseq_handler handler,
-		     size_t *offsets,
-		     char **resultp, size_t *lengthp);
+                     const char *from_codeset, const char *to_codeset,
+                     bool transliterate,
+                     enum iconv_ilseq_handler handler,
+                     size_t *offsets,
+                     char **resultp, size_t *lengthp);
 
 /* Convert an entire string from one encoding to another, using iconv.
    The original string is the NUL-terminated string starting at SRC.
@@ -66,9 +67,9 @@ extern int
    successful, otherwise NULL and errno set.  */
 extern char *
        str_iconveha (const char *src,
-		     const char *from_codeset, const char *to_codeset,
-		     bool transliterate,
-		     enum iconv_ilseq_handler handler);
+                     const char *from_codeset, const char *to_codeset,
+                     bool transliterate,
+                     enum iconv_ilseq_handler handler);
 
 
 /* In the above, FROM_CODESET can also be one of the following values:
@@ -82,8 +83,8 @@ extern char *
    Returns 0 upon success, or -1 (with errno set) in case of error.
    Particular errno values: ENOMEM.  */
 extern int
-       iconv_register_autodetect (const char *name,
-				  const char * const *try_in_order);
+       uniconv_register_autodetect (const char *name,
+                                    const char * const *try_in_order);
 
 
 #ifdef __cplusplus