From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Aug 2013 11:08:33 +0000 (+0000)
Subject: Define __VISUALC__ for ICC under Windows again.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/401aad6ce82841d32d5ce31151a143492c98c627?ds=inline

Define __VISUALC__ for ICC under Windows again.

During the refactoring of r74496, the logic of the check for Intel compiler
was slightly altered resulting in not defining __VISUALC__ for it any longer
which broke compilation with it.

Restore this definition now to fix it, even though it could admittedly be
better to explicitly check for __INTELC__ in the places where we currently
only check for __VISUALC__ and reserve the latter only for the case when we
are really using MSVC.

Closes #15359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/compiler.h b/include/wx/compiler.h
index 163f6a58c5..e633ca158e 100644
--- a/include/wx/compiler.h
+++ b/include/wx/compiler.h
@@ -16,9 +16,15 @@
     Compiler detection and related helpers.
  */
 
+/*
+    Notice that Intel compiler can be used as Microsoft Visual C++ add-on and
+    so we should define both __INTELC__ and __VISUALC__ for it.
+ */
 #ifdef __INTEL_COMPILER
 #   define __INTELC__
-#elif defined(_MSC_VER)
+#endif
+
+#if defined(_MSC_VER)
     /*
        define another standard symbol for Microsoft Visual C++: the standard
        one (_MSC_VER) is also defined by some other compilers.