diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-14 21:54:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-14 21:54:28 +0200 |
| commit | 5551b131daef3a621a28dcbbe118920f5b9fabe6 (patch) | |
| tree | 9e07e60063f093a99fa646a0addbc1955940d5f9 | |
| parent | 8455c5ed31c9cb2919f5e62693bab6b09bf60df2 (diff) | |
| download | vim-git-5551b131daef3a621a28dcbbe118920f5b9fabe6.tar.gz | |
patch 8.2.1212: cannot build with Lua 5.4v8.2.1212
Problem: Cannot build with Lua 5.4.
Solution: Use luaL_typeerror instead defining it. (closes #6454)
| -rw-r--r-- | src/if_lua.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/if_lua.c b/src/if_lua.c index 9852c618e..f25c47b53 100644 --- a/src/if_lua.c +++ b/src/if_lua.c @@ -120,6 +120,9 @@ static void luaV_call_lua_func_free(void *state); #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, const char *filename, const char *mode) 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) { diff --git a/src/version.c b/src/version.c index 95b0857fa..dcb16610f 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1212, +/**/ 1211, /**/ 1210, |