MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Kconfig macro use for Lua debug module (oops).

This commit is contained in:
Johny Mattsson 2016-10-04 15:33:40 +11:00
parent 991965e242
commit 233bdc63aa
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/lua/Makefile.projbuild
View File

@ -4,5 +4,4 @@ CFLAGS+=\
-DLUA_OPTIMIZE_MEMORY=2 \ -DLUA_OPTIMIZE_MEMORY=2 \
-DMIN_OPT_LEVEL=2 \ -DMIN_OPT_LEVEL=2 \
-DLUA_OPTIMIZE_DEBUG=$(CONFIG_LUA_OPTIMIZE_DEBUG) \ -DLUA_OPTIMIZE_DEBUG=$(CONFIG_LUA_OPTIMIZE_DEBUG) \
-DLUA_USE_STDIO \

10
components/lua/ldblib.c
View File

@ -17,7 +17,7 @@
#include "lauxlib.h" #include "lauxlib.h"
#include "lualib.h" #include "lualib.h"
#include "lrotable.h" #include "lrotable.h"
#include "sdkconfig.h"
static int db_getregistry (lua_State *L) { static int db_getregistry (lua_State *L) {
@ -25,7 +25,7 @@ static int db_getregistry (lua_State *L) {
return 1; return 1;
} }
#ifndef CONFIG_LUA_USE_BUILTIN_DEBUG_MINIMAL #ifndef CONFIG_LUA_BUILTIN_DEBUG_MINIMAL
static int db_getmetatable (lua_State *L) { static int db_getmetatable (lua_State *L) {
luaL_checkany(L, 1); luaL_checkany(L, 1);
@ -85,7 +85,7 @@ static lua_State *getthread (lua_State *L, int *arg) {
return L; return L;
} }
} }
#ifndef CONFIG_LUA_USE_BUILTIN_DEBUG_MINIMAL #ifndef CONFIG_LUA_BUILTIN_DEBUG_MINIMAL
static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) { static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
if (L == L1) { if (L == L1) {
@ -386,7 +386,7 @@ static int db_errorfb (lua_State *L) {
#define MIN_OPT_LEVEL 1 #define MIN_OPT_LEVEL 1
#include "lrodefs.h" #include "lrodefs.h"
const LUA_REG_TYPE dblib[] = { const LUA_REG_TYPE dblib[] = {
#ifndef CONFIG_LUA_USE_BUILTIN_DEBUG_MINIMAL #ifndef CONFIG_LUA_BUILTIN_DEBUG_MINIMAL
{LSTRKEY("debug"), LFUNCVAL(db_debug)}, {LSTRKEY("debug"), LFUNCVAL(db_debug)},
{LSTRKEY("getfenv"), LFUNCVAL(db_getfenv)}, {LSTRKEY("getfenv"), LFUNCVAL(db_getfenv)},
{LSTRKEY("gethook"), LFUNCVAL(db_gethook)}, {LSTRKEY("gethook"), LFUNCVAL(db_gethook)},
@ -394,7 +394,7 @@ const LUA_REG_TYPE dblib[] = {
{LSTRKEY("getlocal"), LFUNCVAL(db_getlocal)}, {LSTRKEY("getlocal"), LFUNCVAL(db_getlocal)},
#endif #endif
{LSTRKEY("getregistry"), LFUNCVAL(db_getregistry)}, {LSTRKEY("getregistry"), LFUNCVAL(db_getregistry)},
#ifndef CONFIG_LUA_USE_BUILTIN_DEBUG_MINIMAL #ifndef CONFIG_LUA_BUILTIN_DEBUG_MINIMAL
{LSTRKEY("getmetatable"), LFUNCVAL(db_getmetatable)}, {LSTRKEY("getmetatable"), LFUNCVAL(db_getmetatable)},
{LSTRKEY("getupvalue"), LFUNCVAL(db_getupvalue)}, {LSTRKEY("getupvalue"), LFUNCVAL(db_getupvalue)},
{LSTRKEY("setfenv"), LFUNCVAL(db_setfenv)}, {LSTRKEY("setfenv"), LFUNCVAL(db_setfenv)},