merge from trunk

[gnu-emacs] / nt / addsection.c

diff --git a/nt/addsection.c b/nt/addsection.c
index d720dec428fcadc247650cd3b1d362ee1b56d6d4..61a8cfce742fb6c7d0a47b303c512323b9f878d1 100644 (file)
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,5 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -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