Merge pull request #2991 from shyouhei/ruby.h

Split ruby.h

1 files changed, 4 insertions, 19 deletions

diff --git a/include/ruby/util.h b/include/ruby/util.h
index 3fecba8ebc..d5c735c97e 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -12,17 +12,9 @@
 #ifndef RUBY_UTIL_H
 #define RUBY_UTIL_H 1
 
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
+#include "ruby/3/config.h"
+#include "ruby/3/dllexport.h"
 #include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
 
 #ifndef _
 #ifdef __cplusplus
@@ -45,7 +37,7 @@ extern "C" {
 #endif
 #endif
 
-RUBY_SYMBOL_EXPORT_BEGIN
+RUBY3_SYMBOL_EXPORT_BEGIN()
 
 #define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
 /* an approximation of ceil(n * log10(2)), up to 65536 at least */
@@ -77,13 +69,6 @@ double ruby_strtod(const char *, char **);
 
 void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
 
-RUBY_SYMBOL_EXPORT_END
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
+RUBY3_SYMBOL_EXPORT_END()
 
 #endif /* RUBY_UTIL_H */