Fix for api_require wrong macro && conditions (#1465)
This mistake escaped my eyes when reviewing #1437 and causes some symbols to not be exported, because the preprocessor macros are expecting multiple LUA versions to evaluate as true at once. The fix is to replace `&&` with `||`.
This commit is contained in:
parent
2978037f51
commit
baa8f528f1
|
@ -931,7 +931,7 @@ typedef struct lua_function_node {
|
||||||
#define S(FUNC) { #FUNC, (fptr)(FUNC) }
|
#define S(FUNC) { #FUNC, (fptr)(FUNC) }
|
||||||
static void* api_require(const char* symbol) {
|
static void* api_require(const char* symbol) {
|
||||||
static const lua_function_node nodes[] = {
|
static const lua_function_node nodes[] = {
|
||||||
#if LUA_VERSION_NUM == 501 && LUA_VERSION_NUM == 502 && LUA_VERSION_NUM == 503 && LUA_VERSION_NUM == 504
|
#if LUA_VERSION_NUM == 501 || LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504
|
||||||
U(addlstring), U(addstring), U(addvalue), U(argerror), U(buffinit),
|
U(addlstring), U(addstring), U(addvalue), U(argerror), U(buffinit),
|
||||||
U(callmeta), U(checkany), U(checkinteger), U(checklstring),
|
U(callmeta), U(checkany), U(checkinteger), U(checklstring),
|
||||||
U(checknumber), U(checkoption), U(checkstack), U(checktype),
|
U(checknumber), U(checkoption), U(checkstack), U(checktype),
|
||||||
|
@ -954,7 +954,7 @@ static void* api_require(const char* symbol) {
|
||||||
S(luaopen_math), S(luaopen_os), S(luaopen_package), S(luaopen_string),
|
S(luaopen_math), S(luaopen_os), S(luaopen_package), S(luaopen_string),
|
||||||
S(luaopen_table), S(api_load_libs),
|
S(luaopen_table), S(api_load_libs),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 502 && LUA_VERSION_NUM == 503 && LUA_VERSION_NUM == 504
|
#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504
|
||||||
U(buffinitsize), U(checkversion_), U(execresult), U(fileresult),
|
U(buffinitsize), U(checkversion_), U(execresult), U(fileresult),
|
||||||
U(getsubtable), U(len), U(loadbufferx), U(loadfilex), U(prepbuffsize),
|
U(getsubtable), U(len), U(loadbufferx), U(loadfilex), U(prepbuffsize),
|
||||||
U(pushresultsize), U(requiref), U(setfuncs), U(setmetatable),
|
U(pushresultsize), U(requiref), U(setfuncs), U(setmetatable),
|
||||||
|
@ -964,17 +964,17 @@ static void* api_require(const char* symbol) {
|
||||||
P(tonumberx), P(upvalueid), P(upvaluejoin), P(version), P(yieldk),
|
P(tonumberx), P(upvalueid), P(upvaluejoin), P(version), P(yieldk),
|
||||||
S(luaopen_coroutine),
|
S(luaopen_coroutine),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 501 && LUA_VERSION_NUM == 502 && LUA_VERSION_NUM == 503
|
#if LUA_VERSION_NUM == 501 || LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
|
||||||
P(newuserdata),
|
P(newuserdata),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 503 && LUA_VERSION_NUM == 504
|
#if LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504
|
||||||
P(geti), P(isinteger), P(isyieldable), P(rotate), P(seti),
|
P(geti), P(isinteger), P(isyieldable), P(rotate), P(seti),
|
||||||
P(stringtonumber), S(luaopen_utf8),
|
P(stringtonumber), S(luaopen_utf8),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 502 && LUA_VERSION_NUM == 503
|
#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
|
||||||
P(getuservalue), P(setuservalue), S(luaopen_bit32),
|
P(getuservalue), P(setuservalue), S(luaopen_bit32),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 501 && LUA_VERSION_NUM == 502
|
#if LUA_VERSION_NUM == 501 || LUA_VERSION_NUM == 502
|
||||||
P(insert), P(remove), P(replace),
|
P(insert), P(remove), P(replace),
|
||||||
#endif
|
#endif
|
||||||
#if LUA_VERSION_NUM == 504
|
#if LUA_VERSION_NUM == 504
|
||||||
|
|
Loading…
Reference in New Issue