From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 1 Oct 2013 23:04:51 +0000 (+0000)
Subject: Add more checks for Intel compiler.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/42ed9e53adbb0ec00b967270f072e39f3b998cd3

Add more checks for Intel compiler.

This should have been part of r74888.

Closes #15359.

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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 800b745fa6..b745fe6fe7 100644
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -23,7 +23,7 @@
        __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well
        as VC++.
      */
-#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) || (defined(__WINDOWS__) && defined(__INTELC__))
 #        define WXEXPORT __declspec(dllexport)
 #        define WXIMPORT __declspec(dllimport)
     /*
diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 79e437850a..20ce1823d2 100644
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -165,7 +165,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 
 /* Almost all compilers have strdup(), but VC++ and MinGW call it _strdup().
    And it's not available in MinGW strict ANSI mode nor under Windows CE. */
-#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || (defined(__VISUAC__) && defined (__INTELC__))
+#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || (defined(_MSC_VER) && _MSC_VER >= 1400 && defined (__INTELC__))
     #define wxCRT_StrdupA _strdup
 #elif defined(__MINGW32__)
     #ifndef __WX_STRICT_ANSI_GCC__
diff --git a/src/common/time.cpp b/src/common/time.cpp
index 011b601490..5c42a1d71e 100644
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -190,7 +190,7 @@ int wxGetTimeZone()
     struct timeb tb;
     ftime(&tb);
     return tb.timezone*60;
-#elif defined(__VISUALC__)
+#elif defined(__VISUALC__) || (defined(__WINDOWS__) && defined(__INTELC__))
     // We must initialize the time zone information before using it (this will
     // be done only once internally).
     _tzset();