From 7aab062ef3772c7e8e50fc872a1647918c76dbba Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 7 Jan 2016 02:34:33 +0000
Subject: version.c: no exit in ruby_show_copyright

* include/ruby/backward.h (ruby_show_copyright_to_die): for source
  code backward compatibility.
* ruby.c (process_options): return Qtrue to exit the process
  successfully.
* version.c (ruby_show_copyright): no longer exit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/backward.h | 20 ++++++++++++++++++++
 include/ruby/ruby.h     |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 include/ruby/backward.h

(limited to 'include/ruby')

diff --git a/include/ruby/backward.h b/include/ruby/backward.h
new file mode 100644
index 0000000000..4574cb98da
--- /dev/null
+++ b/include/ruby/backward.h
@@ -0,0 +1,20 @@
+#ifndef RUBY_RUBY_BACKWARD_H
+#define RUBY_RUBY_BACKWARD_H 1
+
+#ifndef RUBY_SHOW_COPYRIGHT_TO_DIE
+# define RUBY_SHOW_COPYRIGHT_TO_DIE 1
+#endif
+#if RUBY_SHOW_COPYRIGHT_TO_DIE
+/* for source code backward compatibility */
+DEPRECATED(static inline int ruby_show_copyright_to_die(int));
+static inline int
+ruby_show_copyright_to_die(int exitcode)
+{
+    ruby_show_copyright();
+    return exitcode;
+}
+#define ruby_show_copyright() /* defer EXIT_SUCCESS */ \
+    (exit(ruby_show_copyright_to_die(EXIT_SUCCESS)))
+#endif
+
+#endif /* RUBY_RUBY_BACKWARD_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 14fe7c3e16..7aabf5bd68 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -2206,6 +2206,10 @@ void ruby_sig_finalize(void);
 
 /*! @} */
 
+#if !defined RUBY_EXPORT && !defined RUBY_NO_OLD_COMPATIBILITY
+# include "ruby/backward.h"
+#endif
+
 RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)
-- 
cgit v1.2.3