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

Add more checks for Intel compiler.

Browse Source 
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:
Vadim Zeitlin
2013-10-01 23:04:51 +00:00
parent 9ed99f82da
commit 42ed9e53ad
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dlimpexp.h
View File

@@ -23,7 +23,7 @@
__declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well
as VC++. 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 WXEXPORT __declspec(dllexport)
# define WXIMPORT __declspec(dllimport) # define WXIMPORT __declspec(dllimport)
/* /*

2
include/wx/wxcrtbase.h
View File

@@ -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(). /* 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. */ 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 #define wxCRT_StrdupA _strdup
#elif defined(__MINGW32__) #elif defined(__MINGW32__)
#ifndef __WX_STRICT_ANSI_GCC__ #ifndef __WX_STRICT_ANSI_GCC__

2
src/common/time.cpp
View File

@@ -190,7 +190,7 @@ int wxGetTimeZone()
struct timeb tb; struct timeb tb;
ftime(&tb); ftime(&tb);
return tb.timezone*60; 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 // We must initialize the time zone information before using it (this will
// be done only once internally). // be done only once internally).
_tzset(); _tzset();