From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 31 May 2018 08:20:34 +0000 (+0300)
Subject: Do not redefine MSWIN32 macro (WCC)
X-Git-Tag: v7.6.8~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17f1a459045321c898dba28ffb529587b03c12a2;p=gc

Do not redefine MSWIN32 macro (WCC)
(a cherry-pick of commit 69c0495c from 'master')

* include/private/gcconfig.h [!_WIN32_WCE && !__CEGCC__
&& !__MINGW32CE__] (MSWIN32): Do not define if already
defined.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 30d4ef31..ea3e6f16 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -501,7 +501,9 @@
 #     else
 #       define I386
 #     endif
-#     define MSWIN32    /* or Win64 */
+#     ifndef MSWIN32
+#       define MSWIN32 /* or Win64 */
+#     endif
 #     define mach_type_known
 #   endif
 #   if defined(_MSC_VER) && defined(_M_IA64)