autoupdate

[gnulib.git] / lib / striconveha.h

diff --git a/lib/striconveha.h b/lib/striconveha.h
index 9c4c676..5ead5a6 100644 (file)
--- a/lib/striconveha.h
+++ b/lib/striconveha.h
@@ -1,11 +1,11 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2009 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
-   This program is free software; you can redistribute it and/or modify
+   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, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 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
@@ -13,15 +13,15 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _STRICONVEHA_H
 #define _STRICONVEHA_H
 
 #include <stdbool.h>
+#include <stddef.h>
 
-#include "striconveh.h"
+#include "iconveh.h"
 
 
 #ifdef __cplusplus
@@ -83,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