From 49edc2d2ce8a88be46d3c9378ac11794ad108580 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Feb 2017 06:07:22 +0000
Subject: error.c: remove deprecated internal features

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 error.c                 | 18 ------------------
 include/ruby/backward.h | 11 +++++++++++
 include/ruby/intern.h   |  3 ---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/error.c b/error.c
index d174464bbf..568e47fc3a 100644
--- a/error.c
+++ b/error.c
@@ -129,24 +129,6 @@ rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
     return exc;
 }
 
-void
-rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
-{
-    DEPRECATED_INTERNAL_FEATURE("rb_compile_error_with_enc()");
-}
-
-void
-rb_compile_error(const char *file, int line, const char *fmt, ...)
-{
-    DEPRECATED_INTERNAL_FEATURE("rb_compile_error()");
-}
-
-void
-rb_compile_error_append(const char *fmt, ...)
-{
-    DEPRECATED_INTERNAL_FEATURE("rb_compile_error_append()");
-}
-
 void
 ruby_deprecated_internal_feature(const char *func)
 {
diff --git a/include/ruby/backward.h b/include/ruby/backward.h
index 0ae9911da8..ebe86b427d 100644
--- a/include/ruby/backward.h
+++ b/include/ruby/backward.h
@@ -24,6 +24,17 @@ DECLARE_DEPRECATED_FEATURE(2.2, rb_str_associated);
 DECLARE_DEPRECATED_FEATURE(2.2, rb_clear_cache);
 DECLARE_DEPRECATED_FEATURE(2.2, rb_frame_pop);
 
+#define DECLARE_DEPRECATED_INTERNAL_FEATURE(func) \
+    NORETURN(ERRORFUNC(("deprecated internal function"), DEPRECATED(void func(void))))
+
+/* error.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error);
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_with_enc);
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_compile_error_append);
+
+/* struct.c */
+DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_struct_ptr);
+
 /* from version.c */
 #ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
 # define RUBY_SHOW_COPYRIGHT_TO_DIE 1
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index d9aecf3446..ac2e539a65 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -247,9 +247,6 @@ PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)),
 PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
 PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3);
 NORETURN(void rb_invalid_str(const char*, const char*));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4)));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5)));
-NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2)));
 NORETURN(void rb_error_frozen(const char*));
 NORETURN(void rb_error_frozen_object(VALUE));
 CONSTFUNC(void rb_error_untrusted(VALUE));
-- 
cgit v1.2.3