From 3c4d788bfe7ea2fe2e9b6c0246237be45a41a12e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 8 Jul 2023 01:47:06 +0900 Subject: macos: symbols for `rb_execution_context_t` should be internal --- thread_pthread.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'thread_pthread.h') diff --git a/thread_pthread.h b/thread_pthread.h index bf97c7a0ee..10d3fcd928 100644 --- a/thread_pthread.h +++ b/thread_pthread.h @@ -90,19 +90,18 @@ struct rb_thread_sched { int wait_yield; }; -RUBY_SYMBOL_EXPORT_BEGIN #ifdef RB_THREAD_LOCAL_SPECIFIER - # ifdef __APPLE__ - // on Darwin, TLS can not be accessed across .so - struct rb_execution_context_struct *rb_current_ec(void); - void rb_current_ec_set(struct rb_execution_context_struct *); - # else - RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec; - - // for RUBY_DEBUG_LOG() - RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER rb_atomic_t ruby_nt_serial; - #define RUBY_NT_SERIAL 1 - # endif +# ifdef __APPLE__ +// on Darwin, TLS can not be accessed across .so +struct rb_execution_context_struct *rb_current_ec(void); +void rb_current_ec_set(struct rb_execution_context_struct *); +# else +RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec; + +// for RUBY_DEBUG_LOG() +RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER rb_atomic_t ruby_nt_serial; +#define RUBY_NT_SERIAL 1 +# endif #else typedef pthread_key_t native_tls_key_t; @@ -123,6 +122,5 @@ native_tls_set(native_tls_key_t key, void *ptr) RUBY_EXTERN native_tls_key_t ruby_current_ec_key; #endif -RUBY_SYMBOL_EXPORT_END #endif /* RUBY_THREAD_PTHREAD_H */ -- cgit v1.2.3