5 files changed, 8 insertions, 17 deletions
diff --git a/include/ruby/backward/classext.h b/include/ruby/backward/classext.h
index 615e6f6858..9d5747316a 100644
--- a/include/ruby/backward/classext.h
+++ b/include/ruby/backward/classext.h
@@ -1,6 +1,6 @@
 #if   defined __GNUC__
 #warning use of RClass internals is deprecated
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
 #pragma message("warning: use of RClass internals is deprecated")
 #endif
 
@@ -13,6 +13,6 @@ typedef struct rb_deprecated_classext_struct {
 
 #undef RCLASS_SUPER(c)
 #define RCLASS_EXT(c) ((rb_deprecated_classext_t *)RCLASS(c)->ptr)
-#define RCLASS_SUPER(c) (RCLASS_EXT(c)->super)
+#define RCLASS_SUPER(c) (RCLASS(c)->super)
 
 #endif	/* RUBY_BACKWARD_CLASSEXT_H */
diff --git a/include/ruby/backward/rubyio.h b/include/ruby/backward/rubyio.h
index d5246db546..a6e3a7c78b 100644
--- a/include/ruby/backward/rubyio.h
+++ b/include/ruby/backward/rubyio.h
@@ -1,6 +1,6 @@
 #if   defined __GNUC__
 #warning use "ruby/io.h" instead of "rubyio.h"
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
 #pragma message("warning: use \"ruby/io.h\" instead of \"rubyio.h\"")
 #endif
 #include "ruby/io.h"
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
index f46679ae67..58b13cab1c 100644
--- a/include/ruby/backward/rubysig.h
+++ b/include/ruby/backward/rubysig.h
@@ -12,7 +12,7 @@
 
 #if   defined __GNUC__
 #warning rubysig.h is obsolete
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
 #pragma message("warning: rubysig.h is obsolete")
 #endif
 
@@ -27,24 +27,15 @@ extern "C" {
 #endif
 #endif
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
+RUBY_SYMBOL_EXPORT_BEGIN
 
-struct rb_blocking_region_buffer;
-DEPRECATED(RUBY_EXTERN struct rb_blocking_region_buffer *rb_thread_blocking_region_begin(void));
-DEPRECATED(RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_region_buffer *));
-#define TRAP_BEG do {struct rb_blocking_region_buffer *__region = rb_thread_blocking_region_begin();
-#define TRAP_END rb_thread_blocking_region_end(__region);} while (0)
 #define RUBY_CRITICAL(statements) do {statements;} while (0)
 #define DEFER_INTS (0)
 #define ENABLE_INTS (1)
 #define ALLOW_INTS do {CHECK_INTS;} while (0)
 #define CHECK_INTS rb_thread_check_ints()
 
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)
 #if 0
diff --git a/include/ruby/backward/st.h b/include/ruby/backward/st.h
index 514128e616..3e36d44cf8 100644
--- a/include/ruby/backward/st.h
+++ b/include/ruby/backward/st.h
@@ -1,6 +1,6 @@
 #if   defined __GNUC__
 #warning use "ruby/st.h" instead of bare "st.h"
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
 #pragma message("warning: use \"ruby/st.h\" instead of bare \"st.h\"")
 #endif
 #include "ruby/st.h"
diff --git a/include/ruby/backward/util.h b/include/ruby/backward/util.h
index 6b47940ddc..11d32a2da8 100644
--- a/include/ruby/backward/util.h
+++ b/include/ruby/backward/util.h
@@ -1,6 +1,6 @@
 #if   defined __GNUC__
 #warning use "ruby/util.h" instead of bare "util.h"
-#elif defined _MSC_VER || defined __BORLANDC__
+#elif defined _MSC_VER
 #pragma message("warning: use \"ruby/util.h\" instead of bare \"util.h\"")
 #endif
 #include "ruby/util.h"