X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20125017a4bccd0920ee21e178950b0de0e4d63b..a255c995a18e60ff48fd1b337b2ce0a13843421d:/include/wx/compiler.h

diff --git a/include/wx/compiler.h b/include/wx/compiler.h
index 2517a90ad6..e633ca158e 100644
--- a/include/wx/compiler.h
+++ b/include/wx/compiler.h
@@ -16,9 +16,15 @@
     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
 #   define __INTELC__
-#elif defined(_MSC_VER)
+#endif
+
+#if defined(_MSC_VER)
     /*
        define another standard symbol for Microsoft Visual C++: the standard
        one (_MSC_VER) is also defined by some other compilers.
@@ -132,21 +138,14 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
-      wxCHECK_WATCOM_VERSION(1,0) ) && \
-    !defined(__DOS__) && \
-    !defined(__WXPM__) && \
-    !defined(__WXMOTIF__) && \
-    !defined(__WXX11__)
-#    include "wx/msw/gccpriv.h"
+
+/* Check for Mingw runtime version: */
+#if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
+    #define wxCHECK_MINGW32_VERSION( major, minor ) \
+ ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
+      || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
 #else
-#    undef wxCHECK_W32API_VERSION
-#    define wxCHECK_W32API_VERSION(maj, min) (0)
-#    undef wxCHECK_MINGW32_VERSION
-#    define wxCHECK_MINGW32_VERSION(maj, min) (0)
+    #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
 #endif
 
-
 #endif // _WX_COMPILER_H_
-