[Emacs-diffs] /srv/bzr/emacs/trunk r112143: More MinGW64 related fixes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112143
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 16:26:24 +0200
message:
  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.
modified:
  nt/ChangeLog
  nt/addsection.c
  nt/preprep.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-03-26 13:45:01 +0000
+++ b/nt/ChangeLog      2013-03-26 14:26:24 +0000
@@ -1,5 +1,11 @@
 2013-03-26  Eli Zaretskii  <address@hidden>
 
+       * 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

=== modified file 'nt/addsection.c'
--- a/nt/addsection.c   2013-01-01 09:11:05 +0000
+++ b/nt/addsection.c   2013-03-26 14:26:24 +0000
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif

=== modified file 'nt/preprep.c'
--- a/nt/preprep.c      2013-01-01 09:11:05 +0000
+++ b/nt/preprep.c      2013-03-26 14:26:24 +0000
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif