aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/util
diff options
context:
space:
mode:
authorMax Horn2011-05-26 08:14:57 +0200
committerMax Horn2011-05-26 08:14:57 +0200
commit2c8a9b0e7669df1914b8e01d347fef7e8776ef11 (patch)
treeaf566146103345e51977276262f20fe908c75752 /engines/sword25/util
parentbf490b4084d7d1fbec52fc2c6b47ae7a0156c7fc (diff)
downloadscummvm-rg350-2c8a9b0e7669df1914b8e01d347fef7e8776ef11.tar.gz
scummvm-rg350-2c8a9b0e7669df1914b8e01d347fef7e8776ef11.tar.bz2
scummvm-rg350-2c8a9b0e7669df1914b8e01d347fef7e8776ef11.zip
SWORD25: Avoid using strcoll
Diffstat (limited to 'engines/sword25/util')
-rw-r--r--engines/sword25/util/lua/luaconf.h8
-rw-r--r--engines/sword25/util/lua/lvm.cpp2
2 files changed, 1 insertions, 9 deletions
diff --git a/engines/sword25/util/lua/luaconf.h b/engines/sword25/util/lua/luaconf.h
index 16cd6ba27f..f3509e969b 100644
--- a/engines/sword25/util/lua/luaconf.h
+++ b/engines/sword25/util/lua/luaconf.h
@@ -18,14 +18,6 @@
** ===================================================================
*/
-#if defined(__ANDROID__)
-/* Android is missing strcoll().
-** For more information, refer to:
-** http://www.damonkohler.com/2008/12/lua-on-android.html
-*/
-#define strcoll strcmp
-#endif
-
/*
@@ LUA_ANSI controls the use of non-ansi features.
diff --git a/engines/sword25/util/lua/lvm.cpp b/engines/sword25/util/lua/lvm.cpp
index ae70fe2645..fb700c20a2 100644
--- a/engines/sword25/util/lua/lvm.cpp
+++ b/engines/sword25/util/lua/lvm.cpp
@@ -202,7 +202,7 @@ static int l_strcmp (const TString *ls, const TString *rs) {
const char *r = getstr(rs);
size_t lr = rs->tsv.len;
for (;;) {
- int temp = strcoll(l, r);
+ int temp = strcmp(l, r);
if (temp != 0) return temp;
else { /* strings are equal up to a `\0' */
size_t len = strlen(l); /* index of first `\0' in both strings */