diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-26 16:26:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-26 16:26:24 +0200 |
| commit | 9536ec028c24fbedf617b67e98a108504e5b1e73 (patch) | |
| tree | 5697729ccbc10cf99c6c8bf276b6adb3fa091ce6 | |
| parent | 8f5e14c849415e68add0e617277ffa33325b5593 (diff) | |
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.
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/addsection.c | 2 | ||||
| -rw-r--r-- | nt/preprep.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 10f145a0dd..031735edac 100644 --- 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 ee68ebee9b..61a8cfce74 100644 --- 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 8604dd40c1..42855ce7f2 100644 --- 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 |