From 9536ec028c24fbedf617b67e98a108504e5b1e73 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 26 Mar 2013 16:26:24 +0200 Subject: [PATCH] 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. --- nt/ChangeLog | 6 ++++++ nt/addsection.c | 2 +- nt/preprep.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 10f145a0dd9..031735edac8 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,11 @@ 2013-03-26 Eli Zaretskii + * 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 ee68ebee9b2..61a8cfce742 100644 --- a/nt/addsection.c +++ b/nt/addsection.c @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see . #include #include #include -#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 8604dd40c1f..42855ce7f20 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see . #include #include #include -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_W64) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif -- 2.39.2