Skip to content

Commit

Permalink
Remove UTIL_SYMBOL_HIDDEN
Browse files Browse the repository at this point in the history
> Android can not set __attribute__((__visibility__("hidden"))
  • Loading branch information
owent committed Mar 17, 2020
1 parent f2e5246 commit 071dee8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
10 changes: 5 additions & 5 deletions include/libcopp/coroutine/coroutine_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ namespace copp {
void * priv_data_;
size_t private_buffer_size_;

struct UTIL_SYMBOL_HIDDEN jump_src_data_t {
struct jump_src_data_t {
coroutine_context *from_co;
coroutine_context *to_co;
void * priv_data;
Expand Down Expand Up @@ -144,12 +144,12 @@ namespace copp {
* @param private_buffer_size size of private buffer
* @return COPP_EC_SUCCESS or error code
*/
static LIBCOPP_COPP_API int create(coroutine_context *p, callback_t &runner, const stack_context &callee_stack, size_t coroutine_size,
size_t private_buffer_size) UTIL_CONFIG_NOEXCEPT;
static LIBCOPP_COPP_API int create(coroutine_context *p, callback_t &runner, const stack_context &callee_stack,
size_t coroutine_size, size_t private_buffer_size) UTIL_CONFIG_NOEXCEPT;

template <typename TRunner>
static LIBCOPP_COPP_API_HEAD_ONLY int create(coroutine_context *p, TRunner *runner, const stack_context &callee_stack,
size_t coroutine_size, size_t private_buffer_size) UTIL_CONFIG_NOEXCEPT {
size_t coroutine_size, size_t private_buffer_size) UTIL_CONFIG_NOEXCEPT {
return create(p, std::bind(&TRunner::operator(), runner, std::placeholders::_1), callee_stack, coroutine_size,
private_buffer_size);
}
Expand Down Expand Up @@ -216,7 +216,7 @@ namespace copp {
#if defined(UTIL_CONFIG_COMPILER_CXX_RVALUE_REFERENCES) && UTIL_CONFIG_COMPILER_CXX_RVALUE_REFERENCES
LIBCOPP_COPP_API int set_runner(callback_t &&runner);
#else
LIBCOPP_COPP_API int set_runner(const callback_t &runner);
LIBCOPP_COPP_API int set_runner(const callback_t &runner);
#endif

/**
Expand Down
5 changes: 0 additions & 5 deletions include/libcopp/utils/config/compile_optimize.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,12 @@
#define UTIL_SYMBOL_EXPORT __attribute__((__visibility__("default")))
#define UTIL_SYMBOL_IMPORT __attribute__((__visibility__("default")))
#define UTIL_SYMBOL_VISIBLE __attribute__((__visibility__("default")))
#define UTIL_SYMBOL_HIDDEN __attribute__((__visibility__("hidden")))
#endif
#else
// config/platform/win32.hpp will define UTIL_SYMBOL_EXPORT, etc., unless already defined
#define UTIL_SYMBOL_EXPORT
#define UTIL_SYMBOL_IMPORT
#define UTIL_SYMBOL_VISIBLE
#define UTIL_SYMBOL_HIDDEN
#endif

#elif defined(_MSC_VER)
Expand Down Expand Up @@ -103,9 +101,6 @@
#ifndef UTIL_SYMBOL_VISIBLE
#define UTIL_SYMBOL_VISIBLE
#endif
#ifndef UTIL_SYMBOL_HIDDEN
#define UTIL_SYMBOL_HIDDEN
#endif

// ---------------- import/export ----------------

Expand Down
10 changes: 5 additions & 5 deletions src/libcopp/coroutine/coroutine_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

#ifdef LIBCOPP_MACRO_USE_SEGMENTED_STACKS
extern "C" {
void __splitstack_getcontext(void * [COPP_MACRO_SEGMENTED_STACK_NUMBER]);
void __splitstack_getcontext(void *[COPP_MACRO_SEGMENTED_STACK_NUMBER]);

void __splitstack_setcontext(void * [COPP_MACRO_SEGMENTED_STACK_NUMBER]);
void __splitstack_setcontext(void *[COPP_MACRO_SEGMENTED_STACK_NUMBER]);

void __splitstack_releasecontext(void * [COPP_MACRO_SEGMENTED_STACK_NUMBER]);
void __splitstack_releasecontext(void *[COPP_MACRO_SEGMENTED_STACK_NUMBER]);

void __splitstack_block_signals_context(void * [COPP_MACRO_SEGMENTED_STACK_NUMBER], int *, int *);
void __splitstack_block_signals_context(void *[COPP_MACRO_SEGMENTED_STACK_NUMBER], int *, int *);
}
#endif

Expand Down Expand Up @@ -91,7 +91,7 @@ namespace copp {
}
#endif

UTIL_SYMBOL_HIDDEN static void coroutine_context_callback(::copp::fcontext::transfer_t src_ctx) {
static void coroutine_context_callback(::copp::fcontext::transfer_t src_ctx) {
assert(src_ctx.data);
if (UTIL_CONFIG_NULLPTR == src_ctx.data) {
abort();
Expand Down

0 comments on commit 071dee8

Please sign in to comment.