From 9e6e39c3512f7a962c44dc3729c98a0f8be90341 Mon Sep 17 00:00:00 2001 From: 卜部昌平 Date: Wed, 8 Apr 2020 13:28:13 +0900 Subject: Merge pull request #2991 from shyouhei/ruby.h Split ruby.h --- include/ruby/encoding.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'include/ruby/encoding.h') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 7ba7974265..334acb35dc 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -12,18 +12,13 @@ #ifndef RUBY_ENCODING_H #define RUBY_ENCODING_H 1 -#if defined(__cplusplus) -extern "C" { -#if 0 -} /* satisfy cc-mode */ -#endif -#endif - +#include "ruby/3/config.h" #include #include "ruby/ruby.h" #include "ruby/oniguruma.h" +#include "ruby/3/dllexport.h" -RUBY_SYMBOL_EXPORT_BEGIN +RUBY3_SYMBOL_EXPORT_BEGIN() enum ruby_encoding_consts { RUBY_ENCODING_INLINE_MAX = 127, @@ -413,13 +408,6 @@ enum ruby_econv_flag_type { /* end of flags for rb_econv_convert */ RUBY_ECONV_FLAGS_PLACEHOLDER}; -RUBY_SYMBOL_EXPORT_END - -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif +RUBY3_SYMBOL_EXPORT_END() #endif /* RUBY_ENCODING_H */ -- cgit v1.2.3