fixed Stricmp ifdef to also check for __unix__

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 44d6803a1b5d6edbf970dbc12744e282e95d71df..a13e34a56cdbadc902f9b58e18df3800566a6e6e 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -87,7 +87,7 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
   return _stricmp(psz1, psz2);
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
   return _stricmp(psz1, psz2);
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);

-#elif   defined(__UNIX__) || defined(__GNUWIN32__)
+#elif   defined(__UNIX__) || defined(__unix__) || defined(__GNUWIN32__)

   return strcasecmp(psz1, psz2);
 #else
   // almost all compilers/libraries provide this function (unfortunately under
   return strcasecmp(psz1, psz2);
 #else
   // almost all compilers/libraries provide this function (unfortunately under


@@ -556,7 +556,7 @@ public:
     //@{
       /// take nLen chars starting at nPos
       wxString(const wxString& str, size_t nPos, size_t nLen = npos)
     //@{
       /// take nLen chars starting at nPos
       wxString(const wxString& str, size_t nPos, size_t nLen = npos)

-      { 
+      {

         wxASSERT( str.GetStringData()->IsValid() );
         InitWith(str.c_str(), nPos, nLen == npos ? 0 : nLen);
       }
         wxASSERT( str.GetStringData()->IsValid() );
         InitWith(str.c_str(), nPos, nLen == npos ? 0 : nLen);
       }