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
This commit is contained in:
@@ -87,7 +87,7 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
|
|||||||
return _stricmp(psz1, psz2);
|
return _stricmp(psz1, psz2);
|
||||||
#elif defined(__BORLANDC__)
|
#elif defined(__BORLANDC__)
|
||||||
return stricmp(psz1, psz2);
|
return stricmp(psz1, psz2);
|
||||||
#elif defined(__UNIX__) || defined(__GNUWIN32__)
|
#elif defined(__UNIX__) || defined(__unix__) || defined(__GNUWIN32__)
|
||||||
return strcasecmp(psz1, psz2);
|
return strcasecmp(psz1, psz2);
|
||||||
#else
|
#else
|
||||||
// almost all compilers/libraries provide this function (unfortunately under
|
// almost all compilers/libraries provide this function (unfortunately under
|
||||||
@@ -556,7 +556,7 @@ public:
|
|||||||
//@{
|
//@{
|
||||||
/// take nLen chars starting at nPos
|
/// take nLen chars starting at nPos
|
||||||
wxString(const wxString& str, size_t nPos, size_t nLen = npos)
|
wxString(const wxString& str, size_t nPos, size_t nLen = npos)
|
||||||
{
|
{
|
||||||
wxASSERT( str.GetStringData()->IsValid() );
|
wxASSERT( str.GetStringData()->IsValid() );
|
||||||
InitWith(str.c_str(), nPos, nLen == npos ? 0 : nLen);
|
InitWith(str.c_str(), nPos, nLen == npos ? 0 : nLen);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user