[Tarantool-patches] [PATCH] refactoring: sync declarations w/ definitions

[Tarantool-patches] [PATCH] refactoring: sync declarations w/ definitions

[Serge Petrenko]

Commit b136a61e51ac871f32658b611d4ce7b7f7d5363c already fixed a similar
problem with build failure on OS X, but later box_return_mp() and
box_session_push() were exported, so their declarations and definitions
also need to be synced.
Add API_EXPORT attribute to the definitions of these functions.

Follow-up #4885
---
https://github.com/tarantool/tarantool/issues/4885
https://github.com/tarantool/tarantool/tree/sp/fix-compiler-warn

 src/box/box.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/box/box.cc b/src/box/box.cc
index ae0907e0f..909af0999 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -1075,7 +1075,7 @@ box_return_tuple(box_function_ctx_t *ctx, box_tuple_t *tuple)
 	return port_c_add_tuple(ctx->port, tuple);
 }
 
-int
+API_EXPORT int
 box_return_mp(box_function_ctx_t *ctx, const char *mp, const char *mp_end)
 {
 	return port_c_add_mp(ctx->port, mp, mp_end);
@@ -1461,7 +1461,7 @@ box_sequence_reset(uint32_t seq_id)
 	return sequence_data_delete(seq_id);
 }
 
-int
+API_EXPORT int
 box_session_push(const char *data, const char *data_end)
 {
 	struct session *session = current_session();
-- 
2.24.2 (Apple Git-127)

Re: [Tarantool-patches] [PATCH] refactoring: sync declarations w/ definitions

[Serge Petrenko]

08.05.2020 14:21, Serge Petrenko пишет:
> Commit b136a61e51ac871f32658b611d4ce7b7f7d5363c already fixed a similar
> problem with build failure on OS X, but later box_return_mp() and
> box_session_push() were exported, so their declarations and definitions
> also need to be synced.
> Add API_EXPORT attribute to the definitions of these functions.
>
> Follow-up #4885


Nevermind, I see it's already fixed in master.

> ---
> https://github.com/tarantool/tarantool/issues/4885
> https://github.com/tarantool/tarantool/tree/sp/fix-compiler-warn
>
>   src/box/box.cc | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/box/box.cc b/src/box/box.cc
> index ae0907e0f..909af0999 100644
> --- a/src/box/box.cc
> +++ b/src/box/box.cc
> @@ -1075,7 +1075,7 @@ box_return_tuple(box_function_ctx_t *ctx, box_tuple_t *tuple)
>   	return port_c_add_tuple(ctx->port, tuple);
>   }
>   
> -int
> +API_EXPORT int
>   box_return_mp(box_function_ctx_t *ctx, const char *mp, const char *mp_end)
>   {
>   	return port_c_add_mp(ctx->port, mp, mp_end);
> @@ -1461,7 +1461,7 @@ box_sequence_reset(uint32_t seq_id)
>   	return sequence_data_delete(seq_id);
>   }
>   
> -int
> +API_EXPORT int
>   box_session_push(const char *data, const char *data_end)
>   {
>   	struct session *session = current_session();

-- 
Serge Petrenko