X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstriconv.c;h=9e4498fa5cbcdccd8331d26e1d2868c30d7fd1a2;hb=4fe68d4176b4f0da64660bb9ce0f5412a6bb24de;hp=5657eda8f287914f0b722679a409e97c79887b0d;hpb=041e6f00a4d6811b671eb5dda95ee6264c50a33d;p=gnulib.git
diff --git a/lib/xstriconv.c b/lib/xstriconv.c
index 5657eda8f..9e4498fa5 100644
--- a/lib/xstriconv.c
+++ b/lib/xstriconv.c
@@ -1,11 +1,11 @@
/* Charset conversion with out-of-memory checking.
- Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2011 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,12 +13,9 @@
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 . */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include
/* Specification. */
#include "xstriconv.h"
@@ -33,7 +30,7 @@
int
xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd,
- char **resultp, size_t *lengthp)
+ char **resultp, size_t *lengthp)
{
int retval = mem_cd_iconv (src, srclen, cd, resultp, lengthp);