summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author卜部昌平 <shyouhei@ruby-lang.org>2020-07-22 11:30:05 +0900
committer卜部昌平 <shyouhei@ruby-lang.org>2020-08-27 15:04:00 +0900
commit1035a3b202ee86bf2b0a1d00eefcfff0d7ab9f6b (patch)
tree4389c7fc37014f38aae2fd1e6c58c7744c24caeb
parent756403d775c7d7d60da179dd9b788d63e72c77ab (diff)
RUBY_SHOW_COPYRIGHT_TO_DIE: flip the default
Commit 7aab062ef3772c7e8e50fc872a1647918c76dbba says: > ruby_show_version() will no longer exits the process, if > RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0. This will be the default in > the future. 3.0 is a good timing for that "future".
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3342
-rw-r--r--include/ruby/backward.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/ruby/backward.h b/include/ruby/backward.h
index d8ea12b8dd..350a58ee95 100644
--- a/include/ruby/backward.h
+++ b/include/ruby/backward.h
@@ -63,12 +63,9 @@ DECLARE_DEPRECATED_INTERNAL_FEATURE(rb_generic_ivar_table);
NORETURN(ERRORFUNC(("internal function"), VALUE rb_mod_const_missing(VALUE, VALUE)));
/* from version.c */
-#ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
-# define RUBY_SHOW_COPYRIGHT_TO_DIE 1
-#endif
-#if RUBY_SHOW_COPYRIGHT_TO_DIE
+#if defined(RUBY_SHOW_COPYRIGHT_TO_DIE) && !!(RUBY_SHOW_COPYRIGHT_TO_DIE+0)
/* for source code backward compatibility */
-DEPRECATED(static inline int ruby_show_copyright_to_die(int));
+RBIMPL_ATTR_DEPRECATED(("since 2.4"))
static inline int
ruby_show_copyright_to_die(int exitcode)
{