Do not define __VISUALC__ for Intel C++ compiler under Windows.
This is confusing and makes it more difficult to test for the "real" MSVC, test for __INTELC__ explicitly wherever needed instead. Also document __INTELC__ in our list of compilers. Closes #15359. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,7 +92,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(__VISUALC__) && !defined(__WXWINCE__)
|
||||
#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || (defined(__WINDOWS__) && defined (__INTELC__))
|
||||
typedef _off_t off_t;
|
||||
#elif defined(__SYMANTEC__)
|
||||
typedef long off_t;
|
||||
@@ -187,7 +187,7 @@ enum wxPosixPermissions
|
||||
#define wxStructStat struct _stat
|
||||
#elif (defined(__WINDOWS__) || defined(__OS2__)) && \
|
||||
( \
|
||||
defined(__VISUALC__) || \
|
||||
(defined(__VISUALC__) || (defined(__WINDOWS__) && defined (__INTELC__))) || \
|
||||
defined(__MINGW64__) || \
|
||||
(defined(__MINGW32__) && !defined(__WINE__) && \
|
||||
wxCHECK_W32API_VERSION(0, 5)) || \
|
||||
@@ -201,10 +201,10 @@ enum wxPosixPermissions
|
||||
#undef wxHAS_HUGE_STDIO_FILES
|
||||
|
||||
// detect compilers which have support for huge files
|
||||
#if defined(__VISUALC__)
|
||||
#if (defined(__VISUALC__) || (defined(__WINDOWS__) && defined (__INTELC__)))
|
||||
#define wxHAS_HUGE_FILES 1
|
||||
#elif defined(__MINGW32__) || defined(__MINGW64__)
|
||||
#define wxHAS_HUGE_FILES 1
|
||||
#define wxHAS_HUGE_FILES 1f
|
||||
#elif defined(_LARGE_FILES)
|
||||
#define wxHAS_HUGE_FILES 1
|
||||
#endif
|
||||
@@ -476,7 +476,6 @@ enum wxPosixPermissions
|
||||
#define wxSeek lseek
|
||||
#define wxFsync fsync
|
||||
#define wxEof eof
|
||||
|
||||
#define wxCRT_MkDir mkdir
|
||||
#define wxCRT_RmDir rmdir
|
||||
|
||||
|
Reference in New Issue
Block a user