woe32dll: Check __MINGW32__ as well as _WIN64 for defining IMP

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 857cbeb2a4a8baeb8cb41c99e8f3af0913f00b6b..31d02b35e5934e7df2bdfacde0864ade779fcd05 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-25  Daiki Ueno  <ueno@gnu.org>
+
+       * intl-exports.c (IMP): Check __MINGW32__ as well as _WIN64.
+
 2012-12-20  Daiki Ueno  <ueno@gnu.org>
 
        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 a18fe5174eb5a64f64e4c7679bc93729d381cd23..4a5126b50e3beb90660d4e25076a991be92aab4d 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.  */
 
  /* 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 ab40dbdd8a29fbe2f3bc726143f76f52eb498959..c36341147265436545d5187a092af7f257acd8aa 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-25  Daiki Ueno  <ueno@gnu.org>
+
+       * woe32dll/export.h (IMP): Check __MINGW32__ as well as _WIN64.
+
 2012-12-25  Daiki Ueno  <ueno@gnu.org>
 
        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 f454eccbd94bde05b445d79a7594bac85cde3068..68e9bcc5fc080c1f33d2a207724391cd98319c0f 100644 (file)
--- 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