From a9a31b1de5776a3b08a82101a4fa711294f0dd1d Mon Sep 17 00:00:00 2001 From: "Manuel A. Fernandez Montecelo" Date: Fri, 27 May 2016 14:28:30 +0100 Subject: Imported Upstream version 0.9.6+really0.9.3 --- lib/iconv.in.h | 61 +++++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) (limited to 'lib/iconv.in.h') diff --git a/lib/iconv.in.h b/lib/iconv.in.h index 6b3d245..5512c60 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 2007-2015 Free Software Foundation, Inc. + Copyright (C) 2007-2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -13,20 +13,20 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program; if not, see . */ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _@GUARD_PREFIX@_ICONV_H +#ifndef _GL_ICONV_H #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif -@PRAGMA_COLUMNS@ /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_ICONV_H@ -#ifndef _@GUARD_PREFIX@_ICONV_H -#define _@GUARD_PREFIX@_ICONV_H +#ifndef _GL_ICONV_H +#define _GL_ICONV_H /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -35,24 +35,22 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -#if @GNULIB_ICONV@ -# if @REPLACE_ICONV_OPEN@ +#if @REPLACE_ICONV_OPEN@ /* An iconv_open wrapper that supports the IANA standardized encoding names ("ISO-8859-1" etc.) as far as possible. */ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iconv_open rpl_iconv_open -# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iconv_open rpl_iconv_open +# endif _GL_FUNCDECL_RPL (iconv_open, iconv_t, (const char *tocode, const char *fromcode) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (iconv_open, iconv_t, (const char *tocode, const char *fromcode)); -# else +#else _GL_CXXALIAS_SYS (iconv_open, iconv_t, (const char *tocode, const char *fromcode)); -# endif -_GL_CXXALIASWARN (iconv_open); #endif +_GL_CXXALIASWARN (iconv_open); #if @REPLACE_ICONV_UTF@ /* Special constants for supporting UTF-{16,32}{BE,LE} encodings. @@ -67,11 +65,10 @@ _GL_CXXALIASWARN (iconv_open); # define _ICONV_UTF32LE_UTF8 (iconv_t)(-168) #endif -#if @GNULIB_ICONV@ -# if @REPLACE_ICONV@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iconv rpl_iconv -# endif +#if @REPLACE_ICONV@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iconv rpl_iconv +# endif _GL_FUNCDECL_RPL (iconv, size_t, (iconv_t cd, @ICONV_CONST@ char **inbuf, size_t *inbytesleft, @@ -80,31 +77,25 @@ _GL_CXXALIAS_RPL (iconv, size_t, (iconv_t cd, @ICONV_CONST@ char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)); -# else +#else _GL_CXXALIAS_SYS (iconv, size_t, (iconv_t cd, @ICONV_CONST@ char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)); -# endif -_GL_CXXALIASWARN (iconv); -# ifndef ICONV_CONST -# define ICONV_CONST @ICONV_CONST@ -# endif #endif +_GL_CXXALIASWARN (iconv); -#if @GNULIB_ICONV@ -# if @REPLACE_ICONV@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iconv_close rpl_iconv_close -# endif +#if @REPLACE_ICONV@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iconv_close rpl_iconv_close +# endif _GL_FUNCDECL_RPL (iconv_close, int, (iconv_t cd)); _GL_CXXALIAS_RPL (iconv_close, int, (iconv_t cd)); -# else +#else _GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd)); -# endif -_GL_CXXALIASWARN (iconv_close); #endif +_GL_CXXALIASWARN (iconv_close); -#endif /* _@GUARD_PREFIX@_ICONV_H */ -#endif /* _@GUARD_PREFIX@_ICONV_H */ +#endif /* _GL_ICONV_H */ +#endif /* _GL_ICONV_H */ -- cgit v1.2.3