X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c51a665c649f7579fb39e62070cef4f66b3210d..c6182d489c7cf71c9dba511e3f68671f5b17d50d:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index 2978dcdca8..4798b67c9c 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -41,9 +41,9 @@ #include "wx/vector.h" #include "wx/xlocale.h" -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/wrapwin.h" -#endif // __WXMSW__ +#endif // __WINDOWS__ #if wxUSE_STD_IOSTREAM #include @@ -1169,12 +1169,6 @@ int wxString::CmpNoCase(const wxString& s) const #if wxUSE_UNICODE -#ifdef __MWERKS__ -#ifndef __SCHAR_MAX__ -#define __SCHAR_MAX__ 127 -#endif -#endif - wxString wxString::FromAscii(const char *ascii, size_t len) { if (!ascii || len == 0)