diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-09-10 22:35:57 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-09-10 22:35:57 +0200 |
| commit | c310bcb62ee9fa091a09ae9bdac5eb74fec16513 (patch) | |
| tree | b7fe5dbd93bb914a7cd755f090c9b145c36ac845 | |
| parent | 0244445f5b7ec6c33eea29295b8d22d58ea57998 (diff) | |
| download | gettext-c310bcb62ee9fa091a09ae9bdac5eb74fec16513.tar.gz | |
iconv.m4: Add support for MSVC compiler.
| -rw-r--r-- | gettext-runtime/m4/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/m4/iconv.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 26de85c09..83dd85530 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,8 @@ +2011-09-10 Bruno Haible <bruno@clisp.org> + + iconv.m4: Add support for MSVC compiler. + * iconv.m4 (AM_ICONV): Use ISO C declaration syntax on MSVC. + 2011-07-07 Bruno Haible <bruno@clisp.org> Avoid literal tabs. diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4 index 085cd068f..98fcd64d3 100644 --- a/gettext-runtime/m4/iconv.m4 +++ b/gettext-runtime/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 17 (gettext-0.18.2) +# iconv.m4 serial 18 (gettext-0.18.2) dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -242,7 +242,7 @@ extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); |