X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dadacffc74279b70bef873e383a749f9aa8141f9..e56d25204f03b9046f883f37f00e890b7b643fe6:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e4f6b3d865..439e76f851 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -573,7 +573,7 @@ typedef int wxWindowID;
     #define except(x) catch(...)
 #endif /*  Metrowerks */
 
-#if defined(__WATCOMC__)
+#if defined(__WATCOMC__) && (__WATCOMC__ < 1240)
     typedef short mode_t;
 #endif
 
@@ -902,7 +902,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("L")
-#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
       #define wxLongLongFmtSpec _T("L")
@@ -963,6 +963,9 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 #if defined(__PALMOS__) && !defined(HAVE_SSIZE_T)
     #define HAVE_SSIZE_T
 #endif
+#if defined(__WATCOMC__) && __WATCOMC__ > 1230
+    #define HAVE_SSIZE_T
+#endif
 #ifndef HAVE_SSIZE_T
     #if SIZEOF_SIZE_T == 4
         typedef wxInt32 ssize_t;