From: Daiki Ueno Date: Tue, 25 Dec 2012 04:54:08 +0000 (+0900) Subject: woe32dll: Check __MINGW32__ as well as _WIN64 for defining IMP X-Git-Tag: v0.18.2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94d77889ada54e8f9642c16d150acd11455e5b55;p=thirdparty%2Fgettext.git woe32dll: Check __MINGW32__ as well as _WIN64 for defining IMP --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 857cbeb2a..31d02b35e 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,7 @@ +2012-12-25 Daiki Ueno + + * intl-exports.c (IMP): Check __MINGW32__ as well as _WIN64. + 2012-12-20 Daiki Ueno localecharset: respect the thread-specific locale on Mac OS X diff --git a/gettext-runtime/intl/intl-exports.c b/gettext-runtime/intl/intl-exports.c index a18fe5174..4a5126b50 100644 --- a/gettext-runtime/intl/intl-exports.c +++ b/gettext-runtime/intl/intl-exports.c @@ -16,10 +16,10 @@ along with this program. If not, see . */ /* IMP(x) is a symbol that contains the address of x. */ -#if _WIN64 - /* mingw W64 changed the symbol prefix from W32 for MSVC - compatibility. See the comments in - mingw-w64-headers/crt/_mingw_mac.h for more details. */ +#if defined _WIN64 && defined __MINGW32__ + /* mingw W64 started using __imp_ prefix for MSVC compatibility since + 2010. Ideally we should check the prefix in configure though, + we assume __imp_ on mingw W64 for the time being. */ # define IMP(x) __imp_##x #else # define IMP(x) _imp__##x diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index ab40dbdd8..c36341147 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,7 @@ +2012-12-25 Daiki Ueno + + * woe32dll/export.h (IMP): Check __MINGW32__ as well as _WIN64. + 2012-12-25 Daiki Ueno Work around error_* symbol conflict with Cygwin 1.7 DLL. diff --git a/gettext-tools/woe32dll/export.h b/gettext-tools/woe32dll/export.h index f454eccbd..68e9bcc5f 100644 --- a/gettext-tools/woe32dll/export.h +++ b/gettext-tools/woe32dll/export.h @@ -94,10 +94,10 @@ #if defined __GNUC__ /* GCC compiler, GNU toolchain */ /* IMP(x) is a symbol that contains the address of x. */ -#if _WIN64 - /* mingw W64 changed the symbol prefix from W32 for MSVC - compatibility. See the comments in - mingw-w64-headers/crt/_mingw_mac.h for more details. */ +#if defined _WIN64 && defined __MINGW32__ + /* mingw W64 started using __imp_ prefix for MSVC compatibility since + 2010. Ideally we should check the prefix in configure though, + we assume __imp_ on mingw W64 for the time being. */ # define IMP(x) __imp_##x #else # define IMP(x) _imp__##x