X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12c194883023e9369b9a507fb22fa23c89288b11..4f85606724061367d0d5ab79444990e36b0acfa6:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 63472e8655..d1c131e03e 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -131,12 +131,16 @@
 
 
 /*
-   some compilers don't support iostream.h any longer, so override the users
-   setting here in such case.
+   some compilers don't support iostream.h any longer, while some of theme
+   are not updated with <iostream> yet, so override the users setting here
+   in such case.
  */
 #if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
 
 /*
@@ -348,9 +352,10 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    !defined(__DOS__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION