lua52 fixes

ianmaclarty · Nov 29, 2017 · ae6b110 · ae6b110
1 parent 3343991
commit ae6b110
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/third_party/lua-5.2.4/src/llex.c b/third_party/lua-5.2.4/src/llex.c
@@ -214,7 +214,11 @@ static void buffreplace (LexState *ls, char from, char to) {
 */
 static void trydecpoint (LexState *ls, SemInfo *seminfo) {
   char old = ls->decpoint;
-  ls->decpoint = getlocaledecpoint();
+  /* AMULET change for android which does not support decimal_point
+   *
+   * ls->decpoint = getlocaledecpoint();
+   */
+  ls->decpoint = '.';
   buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
   if (!buff2d(ls->buff, &seminfo->r)) {
     /* format error with correct decimal point: no more options */

diff --git a/third_party/lua-5.2.4/src/loslib.c b/third_party/lua-5.2.4/src/loslib.c
@@ -78,6 +78,10 @@
 
 
 static int os_execute (lua_State *L) {
+#ifdef IPHONEOS
+  lua_pushinteger(L, 1);
+  return 1;
+#else
   const char *cmd = luaL_optstring(L, 1, NULL);
   int stat = system(cmd);
   if (cmd != NULL)
@@ -86,6 +90,7 @@ static int os_execute (lua_State *L) {
     lua_pushboolean(L, stat);  /* true if there is a shell */
     return 1;
   }
+#endif
 }