Merge pull request #1153 from mmd-osm/patch/issue_1151

luaL_traceback is not supported in Lua 5.1, except for LuaJIT

Author: lonvia

.travis.yml

@@ -72,6 +72,18 @@ matrix:
            CXXFLAGS="-pedantic -Wextra -Werror"
            CC=gcc-5 CXX=g++-5 CPPVERSION=11
 
+    - os: linux
+      dist: bionic
+      compiler: gcc-7
+      env: T="bionic_gcc7_pg12"
+           PG_VERSIONS=12
+           POSTGIS_VERSION=3
+           LUA_VERSION=5.1
+           BUILD_TYPE="Debug" LUAJIT_OPTION="OFF"
+           CXXFLAGS="-pedantic -Wextra -Werror"
+           CC=gcc-7 CXX=g++-7 CPPVERSION=11
+
+
     - os: linux
       dist: bionic
       compiler: gcc-8

src/lua-utils.cpp

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "lua-utils.hpp"
 #include "format.hpp"
 
@@ -136,6 +137,17 @@ bool luaX_get_table_bool(lua_State *lua_state, char const *key, int table_index,
         "{} must contain a '{}' boolean field"_format(error_msg, key)};
 }
 
+
+// Lua 5.1 doesn't support luaL_traceback, unless LuaJIT is used
+#if LUA_VERSION_NUM < 502 && !defined(HAVE_LUAJIT)
+
+int luaX_pcall(lua_State *lua_state, int narg, int nres)
+{
+    return lua_pcall(lua_state, narg, nres, 0);
+}
+
+#else
+
 static int pcall_error_traceback_handler(lua_State *lua_state)
 {
     assert(lua_state);
@@ -166,3 +178,5 @@ int luaX_pcall(lua_State *lua_state, int narg, int nres)
     lua_remove(lua_state, base); // remove message handler from the stack
     return status;
 }
+
+#endif