From: Vadim Zeitlin <vz-libtool@zeitlins.org>
Date: Thu, 23 Jun 2011 09:34:35 +0000 (+0200)
Subject: libtool: Include _CRTIMP in _putenv() declaration in EXE wrapper sources.
X-Git-Tag: v2.5.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383a3807b7ce2bcdae72a73329593dc4cdc4dbea;p=thirdparty%2Flibtool.git

libtool: Include _CRTIMP in _putenv() declaration in EXE wrapper sources.

Re-declaring _putenv() without _CRTIMP in strict ANSI mode when using
MinGW resulted in a warning because of a conflict with the previous
declaration that did use _CRTIMP.

Simply add _CRTIMP to our declaration to avoid it.

* build-aux/ltmain.in (func_emit_cwrapperexe_src): Add _CRTIMP to
_putenv() declaration.

Signed-off-by: Vadim Zeitlin <vz-libtool@zeitlins.org>
---

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 6e992f77c..34af382a6 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -3663,7 +3663,7 @@ EOF
 /* declarations of non-ANSI functions */
 #if defined __MINGW32__
 # ifdef __STRICT_ANSI__
-int _putenv (const char *);
+_CRTIMP int __cdecl _putenv (const char *);
 # endif
 #elif defined __CYGWIN__
 # ifdef __STRICT_ANSI__