Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
f801bf12
Commit
f801bf12
authored
Feb 23, 2019
by
ziggurat29
Committed by
Marcel Stör
Feb 23, 2019
Browse files
fixes #2677 minor syntax issues with some dummy variables that bracket the rodata section (#2678)
parent
62789da0
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/lua/linit.c
View file @
f801bf12
...
@@ -58,8 +58,8 @@ extern const luaR_entry lua_rotable_base[];
...
@@ -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
},
...
...
app/lua/lrotable.h
View file @
f801bf12
...
@@ -66,7 +66,7 @@ int luaR_isrotable(void *p);
...
@@ -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
cons
t
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__)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment