iconv.m4: Add support for MSVC compiler.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 26de85c096e1d86815c8d45faeaca9193e6c26b4..83dd85530755b8bf10d9626500c115dd8dd7f2f4 100644 (file)
--- 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 085cd068f52f3cdd43eda5678cbf63ffb2d4d136..98fcd64d313c2d908294fa2a4f53c07b2b7133f7 100644 (file)
--- 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();