diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-26 00:25:47 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-26 00:25:47 +0100 |
| commit | 46e63da4d8e6b4c50a663e98d150bd83e0eefb83 (patch) | |
| tree | e7a03e5010280216424260da796151cc8c235e15 /src/animation | |
| parent | garage stuff (diff) | |
| parent | Merge pull request #992 from ForeverL95/ForeverL95-patch-1 (diff) | |
| download | re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.gz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.bz2 re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.lz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.xz re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.tar.zst re3-46e63da4d8e6b4c50a663e98d150bd83e0eefb83.zip | |
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp index 8fc2a8dc..7c0a10d4 100644 --- a/src/animation/AnimBlendAssocGroup.cpp +++ b/src/animation/AnimBlendAssocGroup.cpp @@ -1,7 +1,11 @@ #include "common.h" #if defined _WIN32 && !defined __MINGW32__ +#if defined __MWERKS__ +#include <wctype.h> +#else #include "ctype.h" +#endif #else #include <cwctype> #endif @@ -89,18 +93,18 @@ strcmpIgnoringDigits(const char *s1, const char *s2) if(c1) s1++; if(c2) s2++; if(c1 == '\0' && c2 == '\0') return true; -#if defined _WIN32 && !defined __MINGW32__ - if(__ascii_iswdigit(c1) && __ascii_iswdigit(c2)) -#else +#ifndef ASCII_STRCMP if(iswdigit(c1) && iswdigit(c2)) +#else + if(__ascii_iswdigit(c1) && __ascii_iswdigit(c2)) #endif continue; -#if defined _WIN32 && !defined __MINGW32__ - c1 = __ascii_toupper(c1); - c2 = __ascii_toupper(c2); -#else +#ifndef ASCII_STRCMP c1 = toupper(c1); c2 = toupper(c2); +#else + c1 = __ascii_toupper(c1); + c2 = __ascii_toupper(c2); #endif if(c1 && c2 && c1 != c2) |