Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define __VISUALC__ for ICC under Windows again.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-08-07 11:08:33 +00:00
parent 5bd6ad08a7
commit 401aad6ce8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/compiler.h
View File

@@ -16,9 +16,15 @@
Compiler detection and related helpers. 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 #ifdef __INTEL_COMPILER
# define __INTELC__ # define __INTELC__
#elif defined(_MSC_VER) #endif
#if defined(_MSC_VER)
/* /*
define another standard symbol for Microsoft Visual C++: the standard define another standard symbol for Microsoft Visual C++: the standard
one (_MSC_VER) is also defined by some other compilers. one (_MSC_VER) is also defined by some other compilers.