diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:34:01 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:41:01 +0100 |
commit | f4c79b3c08b4b16f504a049b2ef14a238e94508f (patch) | |
tree | 54f859757b8693eb80ebfa23d444d9525053dd51 /lib/iconv.in.h | |
parent | 54eb59cf4948482461e41f73c0a5b1f9c7081326 (diff) | |
download | guile-f4c79b3c08b4b16f504a049b2ef14a238e94508f.tar.gz |
Update Gnulib; use the `func' module.
Update Gnulib to v0.0-3575-g128e4b8.
* m4/gnulib-cache.m4: Add `func'.
Diffstat (limited to 'lib/iconv.in.h')
-rw-r--r-- | lib/iconv.in.h | 57 |
1 files changed, 42 insertions, 15 deletions
diff --git a/lib/iconv.in.h b/lib/iconv.in.h index a607a5bd9..5512c6079 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -28,20 +28,29 @@ #ifndef _GL_ICONV_H #define _GL_ICONV_H +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _GL_ARG_NONNULL is copied here. */ -#ifdef __cplusplus -extern "C" { -#endif +/* The definition of _GL_WARN_ON_USE is copied here. */ #if @REPLACE_ICONV_OPEN@ /* An iconv_open wrapper that supports the IANA standardized encoding names ("ISO-8859-1" etc.) as far as possible. */ -# define iconv_open rpl_iconv_open -extern iconv_t iconv_open (const char *tocode, const char *fromcode) - _GL_ARG_NONNULL ((1, 2)); +# 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 +_GL_CXXALIAS_SYS (iconv_open, iconv_t, + (const char *tocode, const char *fromcode)); #endif +_GL_CXXALIASWARN (iconv_open); #if @REPLACE_ICONV_UTF@ /* Special constants for supporting UTF-{16,32}{BE,LE} encodings. @@ -57,18 +66,36 @@ extern iconv_t iconv_open (const char *tocode, const char *fromcode) #endif #if @REPLACE_ICONV@ -# define iconv rpl_iconv -extern size_t iconv (iconv_t cd, - @ICONV_CONST@ char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); -# define iconv_close rpl_iconv_close -extern int iconv_close (iconv_t cd); +# 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, + char **outbuf, size_t *outbytesleft)); +_GL_CXXALIAS_RPL (iconv, size_t, + (iconv_t cd, + @ICONV_CONST@ char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft)); +#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); - -#ifdef __cplusplus -} +#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 +_GL_CXXALIAS_SYS (iconv_close, int, (iconv_t cd)); #endif +_GL_CXXALIASWARN (iconv_close); + #endif /* _GL_ICONV_H */ #endif /* _GL_ICONV_H */ |