summaryrefslogtreecommitdiff
path: root/lib/iconv.in.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-12-15 20:14:02 +0100
committerLudovic Courtès <ludo@gnu.org>2009-12-15 20:14:19 +0100
commit1cd4fffcde4edd4853e039da9a42e0972d851a51 (patch)
tree82c1f750fd5acf88414b85a421c7b7212d9efcfc /lib/iconv.in.h
parent20ccae8dbb8d92a6a32e0275c517f70961c6b833 (diff)
downloadguile-1cd4fffcde4edd4853e039da9a42e0972d851a51.tar.gz
Use Gnulib's `sys_stat' module; update Gnulib.
* .x-sc_prohibit_S_IS_definition: New file. * m4/gnulib-cache.m4: Add `sys_stat'. * libguile/filesys.c: Remove `S_IS*' macro definitions for Ultrix and MinGW.
Diffstat (limited to 'lib/iconv.in.h')
-rw-r--r--lib/iconv.in.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/iconv.in.h b/lib/iconv.in.h
index 915dce2e7..d90f2897d 100644
--- a/lib/iconv.in.h
+++ b/lib/iconv.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <iconv.h>.
- Copyright (C) 2007-2008 Free Software Foundation, Inc.
+ Copyright (C) 2007-2009 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
@@ -28,6 +28,8 @@
#ifndef _GL_ICONV_H
#define _GL_ICONV_H
+/* The definition of _GL_ARG_NONNULL is copied here. */
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -37,7 +39,8 @@ extern "C" {
/* 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);
+extern iconv_t iconv_open (const char *tocode, const char *fromcode)
+ _GL_ARG_NONNULL ((1, 2));
#endif
#if @REPLACE_ICONV_UTF@
@@ -56,8 +59,8 @@ extern iconv_t iconv_open (const char *tocode, const char *fromcode);
#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);
+ @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);
#endif