summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-23 23:13:40 +0100
committerwithmorten <morten.with@gmail.com>2021-01-24 17:08:34 +0100
commit29fb996b00bd5ab231fb6347d3dfe9d13ec7f652 (patch)
tree72da2a9aae7f4e957cba15e4125d68ec1277a0c4 /src/animation
parentmission cleanup fix (diff)
downloadre3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.gz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.bz2
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.lz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.xz
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.zst
re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index ad6f54a9..935e7fd6 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
@@ -88,18 +92,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)