From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 Sep 2011 20:35:57 +0000 (+0200)
Subject: iconv.m4: Add support for MSVC compiler.
X-Git-Tag: v0.18.2~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c310bcb62ee9fa091a09ae9bdac5eb74fec16513;p=thirdparty%2Fgettext.git

iconv.m4: Add support for MSVC compiler.
---

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();