From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C0E624696C5 for ; Sun, 12 Apr 2020 03:13:42 +0300 (MSK) Received: by smtp50.i.mail.ru with esmtpa (envelope-from ) id 1jNQFq-0005lJ-95 for tarantool-patches@dev.tarantool.org; Sun, 12 Apr 2020 03:13:42 +0300 From: Vladislav Shpilevoy Date: Sun, 12 Apr 2020 02:12:56 +0200 Message-Id: <47c57ce02449f2aa05dae03565708fb5779edf1b.1586650014.git.v.shpilevoy@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 16/43] build: export src/lib/core/exception.cc symbols List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Exports functions used by src/lua/error.lua via FFI. Part of #2971 --- extra/exports | 2 -- src/exports.c | 2 ++ src/lib/core/exception.cc | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/extra/exports b/extra/exports index b15096a57..34c5d2df6 100644 --- a/extra/exports +++ b/extra/exports @@ -6,8 +6,6 @@ ibuf_create ibuf_reinit ibuf_destroy ibuf_reserve_slow -exception_get_string -exception_get_int uuid_nil tt_uuid_create diff --git a/src/exports.c b/src/exports.c index 2d16c175b..fbfde5632 100644 --- a/src/exports.c +++ b/src/exports.c @@ -51,6 +51,7 @@ EXPORT(base64_export_syms); EXPORT(clock_export_syms); EXPORT(csv_export_syms); +EXPORT(exception_export_syms); EXPORT(fiber_export_syms); EXPORT(port_export_syms); EXPORT(random_export_syms); @@ -66,6 +67,7 @@ export_syms(void) base64_export_syms, clock_export_syms, csv_export_syms, + exception_export_syms, fiber_export_syms, port_export_syms, random_export_syms, diff --git a/src/lib/core/exception.cc b/src/lib/core/exception.cc index 180cb0e97..5b106f354 100644 --- a/src/lib/core/exception.cc +++ b/src/lib/core/exception.cc @@ -417,3 +417,13 @@ exception_init() } #undef BuildAlloc + +extern "C" void ** +exception_export_syms(void) +{ + static void *syms[] = { + (void *)exception_get_int, + (void *)exception_get_string, + }; + return syms; +} -- 2.21.1 (Apple Git-122.3)