Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / lib / striconveha.h

diff --git a/lib/striconveha.h b/lib/striconveha.h
index b6b1df8..e739585 100644 (file)
--- 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-2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2014 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:
@@ -83,7 +84,7 @@ extern char *
    Particular errno values: ENOMEM.  */
 extern int
        uniconv_register_autodetect (const char *name,
-                                   const char * const *try_in_order);
+                                    const char * const *try_in_order);
 
 
 #ifdef __cplusplus