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

Give it a chance of working under Lua 5.1

This commit is contained in:
philip 2020-09-22 20:45:05 -04:00 committed by Marcel Stör
parent 60f0150736
commit 3795e22b89
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lua53/luaconf.h
View File

@ -401,7 +401,7 @@
@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89. @@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
** (All uses in Lua have only one format item.) ** (All uses in Lua have only one format item.)
*/ */
#if !defined(LUA_USE_C89) && !defined(LUA_USE_ESP8266) #if !defined(LUA_USE_C89) || defined(LUA_USE_ESP8266)
#define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i) #define l_sprintf(s,sz,f,i) snprintf(s,sz,f,i)
#else #else
#define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i)) #define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s,f,i))

4
app/modules/sjson.c
View File

@ -725,9 +725,9 @@ static void encode_lua_object(lua_State *L, ENC_DATA *data, int argno, const cha
char value[50]; char value[50];
if (lua_isinteger(L, -1)) { if (lua_isinteger(L, -1)) {
l_sprintf(value, sizeof(value), LUA_INTEGER_FMT, lua_tointeger(L, -1)); snprintf(value, sizeof(value), LUA_INTEGER_FMT, lua_tointeger(L, -1));
} else { } else {
l_sprintf(value, sizeof(value), SJSON_FLOAT_FMT, lua_tonumber(L, -1)); snprintf(value, sizeof(value), SJSON_FLOAT_FMT, lua_tonumber(L, -1));
} }
lua_pop(L, 1); lua_pop(L, 1);
if (strcmp(value, "-Infinity") == 0 || strcmp(value, "NaN") == 0 || strcmp(value, "Infinity") == 0) { if (strcmp(value, "-Infinity") == 0 || strcmp(value, "NaN") == 0 || strcmp(value, "Infinity") == 0) {