| author | francesco-ST <francesco.abbate@st.com> | 2011年02月02日 18:13:11 +0100 |
|---|---|---|
| committer | francesco-ST <francesco.abbate@st.com> | 2011年02月02日 18:13:11 +0100 |
| commit | 87feed1b8c36fd42a3750d01382a4978971416cc (patch) | |
| tree | 90f68f0d96a64b3f8ea14fb59655c8154808a24f /lua | |
| parent | 00cb071098589dc5824509d7e7786fde16a00ff2 (diff) | |
| download | gsl-shell-87feed1b8c36fd42a3750d01382a4978971416cc.tar.gz | |
| -rw-r--r-- | lua/src/lgc.c | 2 | ||||
| -rw-r--r-- | lua/src/lparser.c | 4 | ||||
| -rw-r--r-- | lua/src/luaconf.h | 2 |
diff --git a/lua/src/lgc.c b/lua/src/lgc.c index 4146aa2d..711f2dbf 100644 --- a/lua/src/lgc.c +++ b/lua/src/lgc.c @@ -334,7 +334,7 @@ static size_t propagateall (global_State *g) { ** other objects: if really collected, cannot keep them; for userdata ** being finalized, keep them in keys, but not in values */ -#if defined(GSL_SHELL_LUA) && defined(GSL_SHELL_GC_PATCH) +#ifdef GSH_GC_PATCH static int iscleared (const TValue *o, int iskey) { (void) iskey; if (!iscollectable(o)) return 0; diff --git a/lua/src/lparser.c b/lua/src/lparser.c index b72bc153..951f95b5 100644 --- a/lua/src/lparser.c +++ b/lua/src/lparser.c @@ -596,7 +596,7 @@ static void body (LexState *ls, expdesc *e, int needself, int line) { } -#ifdef GSL_SHELL_LUA +#ifdef GSH_SHORT_FSYNTAX static void simplebody (LexState *ls, expdesc *e, int line) { /* simplebody -> parlist `|' expr END */ FuncState new_fs; @@ -789,7 +789,7 @@ static void simpleexp (LexState *ls, expdesc *v) { body(ls, v, 0, ls->linenumber); return; } -#ifdef GSL_SHELL_LUA +#ifdef GSH_SHORT_FSYNTAX case '|': { luaX_next(ls); simplebody(ls, v, ls->linenumber); diff --git a/lua/src/luaconf.h b/lua/src/luaconf.h index 3d4d1846..6905db77 100644 --- a/lua/src/luaconf.h +++ b/lua/src/luaconf.h @@ -8,8 +8,6 @@ #ifndef lconfig_h #define lconfig_h -#define GSL_SHELL_GC_PATCH 1 - #define QUOTEME_(x) #x #define QUOTEME(x) QUOTEME_(x) |