From ddb6f0b537ce3f1d31fb67cdf5bfd7e00bfed4d4 Mon Sep 17 00:00:00 2001 From: Vladimir Davydov <vdavydov.dev@gmail.com> Date: Sat, 10 Feb 2018 18:34:36 +0300 Subject: [PATCH] Fix compilation with ENABLE_BACKTRACE=OFF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/lua/init.c: In function ‘tarantool_panic_handler’: src/lua/init.c:321:2: error: implicit declaration of function ‘print_backtrace’ [-Werror=implicit-function-declaration] print_backtrace(); ^~~~~~~~~~~~~~~ src/lua/fiber.c:244:1: error: ‘lbox_fiber_statof_bt’ defined but not used [-Werror=unused-function] lbox_fiber_statof_bt(struct fiber *f, void *cb_ctx) ^~~~~~~~~~~~~~~~~~~~ --- src/lua/fiber.c | 2 ++ src/lua/init.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lua/fiber.c b/src/lua/fiber.c index d33d439d7d..83b5825df1 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -240,11 +240,13 @@ lbox_fiber_statof(struct fiber *f, void *cb_ctx, bool backtrace) return 0; } +#ifdef ENABLE_BACKTRACE static int lbox_fiber_statof_bt(struct fiber *f, void *cb_ctx) { return lbox_fiber_statof(f, cb_ctx, true); } +#endif static int lbox_fiber_statof_nobt(struct fiber *f, void *cb_ctx) diff --git a/src/lua/init.c b/src/lua/init.c index d1863edac5..a0a7f63f61 100644 --- a/src/lua/init.c +++ b/src/lua/init.c @@ -318,7 +318,9 @@ tarantool_lua_setpaths(struct lua_State *L) static int tarantool_panic_handler(lua_State *L) { const char *problem = lua_tostring(L, -1); +#ifdef ENABLE_BACKTRACE print_backtrace(); +#endif say_crit("%s", problem); int level = 1; lua_Debug ar; -- GitLab