Mercurial > vim
changeset 21323:5b0bbc5d4e74 v8.2.1212
patch 8.2.1212: cannot build with Lua 5.4
Commit: https://github.com/vim/vim/commit/5551b131daef3a621a28dcbbe118920f5b9fabe6
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 14 21:54:28 2020 +0200
patch 8.2.1212: cannot build with Lua 5.4
Problem: Cannot build with Lua 5.4.
Solution: Use luaL_typeerror instead defining it. (closes https://github.com/vim/vim/issues/6454)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 14 Jul 2020 22:00:04 +0200 |
| parents | ade12c914e81 |
| children | e56692e9c20a |
| files | src/if_lua.c src/version.c |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_lua.c +++ b/src/if_lua.c @@ -120,6 +120,9 @@ static void luaV_call_lua_func_free(void #define luaL_loadbufferx dll_luaL_loadbufferx #define luaL_argerror dll_luaL_argerror #endif +#if LUA_VERSION_NUM >= 504 +#define luaL_typeerror dll_luaL_typeerror +#endif #define luaL_checkany dll_luaL_checkany #define luaL_checklstring dll_luaL_checklstring #define luaL_checkinteger dll_luaL_checkinteger @@ -217,6 +220,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode); int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg); #endif +#if LUA_VERSION_NUM >= 504 +int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname); +#endif void (*dll_luaL_checkany) (lua_State *L, int narg); const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l); lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg); @@ -336,6 +342,9 @@ static const luaV_Reg luaV_dll[] = { {"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx}, {"luaL_argerror", (luaV_function) &dll_luaL_argerror}, #endif +#if LUA_VERSION_NUM >= 504 + {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror}, +#endif {"luaL_checkany", (luaV_function) &dll_luaL_checkany}, {"luaL_checklstring", (luaV_function) &dll_luaL_checklstring}, {"luaL_checkinteger", (luaV_function) &dll_luaL_checkinteger}, @@ -457,7 +466,7 @@ lua_enabled(int verbose) } #endif -#if LUA_VERSION_NUM > 501 +#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504 static int luaL_typeerror(lua_State *L, int narg, const char *tname) {