Merge branch 'master' into v2.1

src/luajit.c

@@ -498,15 +498,15 @@ static int handle_luainit(lua_State *L)
     return dostring(L, init, "=" LUA_INIT);
 }
 
-struct Smain {
+static struct Smain {
   char **argv;
   int argc;
   int status;
-};
+} smain;
 
 static int pmain(lua_State *L)
 {
-  struct Smain *s = (struct Smain *)lua_touserdata(L, 1);
+  struct Smain *s = &smain;
   char **argv = s->argv;
   int script;
   int flags = 0;
@@ -555,17 +555,16 @@ static int pmain(lua_State *L)
 int main(int argc, char **argv)
 {
   int status;
-  struct Smain s;
   lua_State *L = lua_open();  /* create state */
   if (L == NULL) {
     l_message(argv[0], "cannot create state: not enough memory");
     return EXIT_FAILURE;
   }
-  s.argc = argc;
-  s.argv = argv;
-  status = lua_cpcall(L, pmain, &s);
+  smain.argc = argc;
+  smain.argv = argv;
+  status = lua_cpcall(L, pmain, NULL);
   report(L, status);
   lua_close(L);
-  return (status || s.status) ? EXIT_FAILURE : EXIT_SUCCESS;
+  return (status || smain.status) ? EXIT_FAILURE : EXIT_SUCCESS;
 }