More MinGW64 related fixes.

 nt/addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
 define for MinGW64.
 nt/preprep.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not define
 for MinGW64.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 10f145a0dd9580db1a4aea72dabf860ce4f0874a..031735edac84034f87c61f0967c75a9763847a1c 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,11 @@
 2013-03-26  Eli Zaretskii  <eliz@gnu.org>
 
+       * addsection.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not
+       define for MinGW64.
+
+       * preprep.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Do not define
+       for MinGW64.
+
        Fix more incompatibilities between MinGW.org and MinGW64 headers
        reported by Óscar Fuentes in
        http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00733.html

diff --git a/nt/addsection.c b/nt/addsection.c
index ee68ebee9b27830e28dd02e5c822a3c23cde8c90..61a8cfce742fb6c7d0a47b303c512323b9f878d1 100644 (file)
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif

diff --git a/nt/preprep.c b/nt/preprep.c
index 8604dd40c1fbd985b6648721a02f1251243e25e1..42855ce7f20d12153192fab4e027160ac18539df 100644 (file)
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif