X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1805077dc2d42e2b04da9895316708e8f4eb9f63..fdd8d7b53897d09dddb698bc7d6cadf7372721fd:/include/wx/string.h?ds=sidebyside

diff --git a/include/wx/string.h b/include/wx/string.h
index c3ce0840a2..94964e5a6a 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -87,6 +87,8 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
   return _stricmp(psz1, psz2);
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
+#elif defined(__WATCOMC__)
+  return stricmp(psz1, psz2);
 #elif   defined(__UNIX__) || defined(__GNUWIN32__)
   return strcasecmp(psz1, psz2);
 #else
@@ -303,12 +305,14 @@ public:
     char& Last()
       { wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; }
 
-    // on 64bit systems, this gives overload problems:
-#if SIZEOF_INT <= 4
+    // on alpha-linux this gives overload problems:
+    // Also on Solaris, so removing for now (JACS)
+#if ! defined(__ALPHA__)
     /// operator version of GetChar
     char  operator[](size_t n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }
 #endif
+
     /// operator version of GetChar
     char  operator[](int n) const
       { ASSERT_VALID_INDEX( n ); return m_pchData[n]; }