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

fixes #2677 minor syntax issues with some dummy variables that bracket the rodata section (#2678)

This commit is contained in:
ziggurat29 2019-02-23 13:49:30 -06:00 committed by Marcel Stör
parent 62789da0bb
commit f801bf126d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lua/linit.c
View File

@ -58,8 +58,8 @@ extern const luaR_entry lua_rotable_base[];
//magic is used; the section names are lexically sorted, so 'a' and 'z' are //magic is used; the section names are lexically sorted, so 'a' and 'z' are
//important to keep the other sections lexically between these two dummy //important to keep the other sections lexically between these two dummy
//variables. Check your mapfile output if you need to fiddle with this stuff. //variables. Check your mapfile output if you need to fiddle with this stuff.
const LOCK_IN_SECTION(A) int _ro_start = 0; const LOCK_IN_SECTION(A) char _ro_start[1] = {0};
const LOCK_IN_SECTION(zzzzzzzz) int _ro_end = 0; const LOCK_IN_SECTION(zzzzzzzz) char _ro_end[1] = {0};
#endif #endif
static const LOCK_IN_SECTION(libs) luaL_reg LUA_LIBS[] = { static const LOCK_IN_SECTION(libs) luaL_reg LUA_LIBS[] = {
{"", luaopen_base}, {"", luaopen_base},

2
app/lua/lrotable.h
View File

@ -66,7 +66,7 @@ int luaR_isrotable(void *p);
#if defined(_MSC_VER) #if defined(_MSC_VER)
//msvc build uses these dummy vars to locate the beginning and ending addresses of the RO data //msvc build uses these dummy vars to locate the beginning and ending addresses of the RO data
extern cons char _ro_start[], _ro_end[]; extern const char _ro_start[], _ro_end[];
#define IN_RODATA_AREA(p) (((const char*)(p)) >= _ro_start && ((const char *)(p)) <= _ro_end) #define IN_RODATA_AREA(p) (((const char*)(p)) >= _ro_start && ((const char *)(p)) <= _ro_end)
#else /* one of the POSIX variants */ #else /* one of the POSIX variants */
#if defined(__CYGWIN__) #if defined(__CYGWIN__)