2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ff471ae90f9..247ec1c34b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT): Define only if
+        undefined.
+
 2014-05-26  Ken Brown  <kbrown@cornell.edu>
 
         * w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,
diff --git a/src/w32.c b/src/w32.c
index 371cae9cb9b..4643fc7fbec 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -73,9 +73,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <grp.h>
 
 /* MinGW64 (_W64) defines these in its _mingw.h.  */
-#if defined(__GNUC__) && !defined(_W64)
-#define _ANONYMOUS_UNION
-#define _ANONYMOUS_STRUCT
+#ifndef _ANONYMOUS_UNION
+# define _ANONYMOUS_UNION
+#endif
+#ifndef _ANONYMOUS_STRUCT
+# define _ANONYMOUS_STRUCT
 #endif
 #include <windows.h>
 /* Some versions of compiler define MEMORYSTATUSEX, some don't, so we