X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52dc2108ae52f9cc997fc80e2b2b0b399b9581ef..27d79a5027bee4f46e57c813d072422065cb1592:/include/wx/string.h diff --git a/include/wx/string.h b/include/wx/string.h index 2e0e2423e2..ad47cd2fbc 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -154,7 +154,7 @@ inline int Stricmp(const char *psz1, const char *psz2) } while ( c1 && (c1 == c2) ); return c1 - c2; -#elif defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) ) +#elif defined(__VISUALC__) return _stricmp(psz1, psz2); #elif defined(__SC__) return _stricmp(psz1, psz2); @@ -172,14 +172,6 @@ inline int Stricmp(const char *psz1, const char *psz2) defined(HAVE_STRCASECMP_IN_STRINGS_H) || \ defined(__GNUWIN32__) return strcasecmp(psz1, psz2); -#elif defined(__MWERKS__) && !defined(__INTEL__) - register char c1, c2; - do { - c1 = tolower(*psz1++); - c2 = tolower(*psz2++); - } while ( c1 && (c1 == c2) ); - - return c1 - c2; #else // almost all compilers/libraries provide this function (unfortunately under // different names), that's why we don't implement our own which will surely @@ -897,7 +889,7 @@ public: public: \ WX_DEFINE_ITERATOR_CATEGORY(WX_STR_ITERATOR_TAG) \ typedef wxUniChar value_type; \ - typedef int difference_type; \ + typedef ptrdiff_t difference_type; \ typedef reference_type reference; \ typedef pointer_type pointer; \ \