[Scummvm-cvs-logs] scummvm master -> 2c8a9b0e7669df1914b8e01d347fef7e8776ef11

fingolfin max at quendi.de
Thu May 26 08:16:32 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2c8a9b0e76 SWORD25: Avoid using strcoll


Commit: 2c8a9b0e7669df1914b8e01d347fef7e8776ef11
    https://github.com/scummvm/scummvm/commit/2c8a9b0e7669df1914b8e01d347fef7e8776ef11
Author: Max Horn (max at quendi.de)
Date: 2011-05-25T23:14:57-07:00

Commit Message:
SWORD25: Avoid using strcoll

Changed paths:
    engines/sword25/util/lua/luaconf.h
    engines/sword25/util/lua/lvm.cpp



diff --git a/engines/sword25/util/lua/luaconf.h b/engines/sword25/util/lua/luaconf.h
index 16cd6ba..f3509e9 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 ae70fe2..fb700c2 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 */






More information about the Scummvm-git-logs mailing list