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
This commit is contained in:
parent
9ed99f82da
commit
42ed9e53ad
@ -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)
|
||||
/*
|
||||
|
@ -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__
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user