nobu	2018-10-14 01:21:06 +0900 (Sun, 14 Oct 2018)

  New Revision: 65063

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65063

  Log:
    Remove compile-time dependencies on ruby/version.h

  Modified files:
    trunk/common.mk
    trunk/iseq.h
Index: iseq.h
===================================================================
--- iseq.h	(revision 65062)
+++ iseq.h	(revision 65063)
@@ -12,10 +12,9 @@ https://github.com/ruby/ruby/blob/trunk/iseq.h#L12
 #ifndef RUBY_ISEQ_H
 #define RUBY_ISEQ_H 1
 
-#include "ruby/version.h"
-
-#define ISEQ_MAJOR_VERSION RUBY_API_VERSION_MAJOR
-#define ISEQ_MINOR_VERSION RUBY_API_VERSION_MINOR
+RUBY_EXTERN const int ruby_api_version[];
+#define ISEQ_MAJOR_VERSION ((unsigned int)ruby_api_version[0])
+#define ISEQ_MINOR_VERSION ((unsigned int)ruby_api_version[1])
 
 #ifndef rb_iseq_t
 typedef struct rb_iseq_struct rb_iseq_t;
Index: common.mk
===================================================================
--- common.mk	(revision 65062)
+++ common.mk	(revision 65063)
@@ -1534,7 +1534,6 @@ compile.$(OBJEXT): $(CCAN_DIR)/container https://github.com/ruby/ruby/blob/trunk/common.mk#L1534
 compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
 compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
 compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-compile.$(OBJEXT): $(hdrdir)/ruby/version.h
 compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
 compile.$(OBJEXT): {$(VPATH)}compile.c
 compile.$(OBJEXT): {$(VPATH)}config.h
@@ -1841,7 +1840,6 @@ eval.$(OBJEXT): $(CCAN_DIR)/container_of https://github.com/ruby/ruby/blob/trunk/common.mk#L1840
 eval.$(OBJEXT): $(CCAN_DIR)/list/list.h
 eval.$(OBJEXT): $(CCAN_DIR)/str/str.h
 eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-eval.$(OBJEXT): $(hdrdir)/ruby/version.h
 eval.$(OBJEXT): $(top_srcdir)/include/ruby.h
 eval.$(OBJEXT): {$(VPATH)}config.h
 eval.$(OBJEXT): {$(VPATH)}defines.h
@@ -1945,7 +1943,6 @@ golf_prelude.$(OBJEXT): $(CCAN_DIR)/cont https://github.com/ruby/ruby/blob/trunk/common.mk#L1943
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
 golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
 golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-golf_prelude.$(OBJEXT): $(hdrdir)/ruby/version.h
 golf_prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
 golf_prelude.$(OBJEXT): {$(VPATH)}config.h
 golf_prelude.$(OBJEXT): {$(VPATH)}defines.h
@@ -2047,7 +2044,6 @@ iseq.$(OBJEXT): $(CCAN_DIR)/container_of https://github.com/ruby/ruby/blob/trunk/common.mk#L2044
 iseq.$(OBJEXT): $(CCAN_DIR)/list/list.h
 iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h
 iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-iseq.$(OBJEXT): $(hdrdir)/ruby/version.h
 iseq.$(OBJEXT): $(top_srcdir)/include/ruby.h
 iseq.$(OBJEXT): {$(VPATH)}config.h
 iseq.$(OBJEXT): {$(VPATH)}defines.h
@@ -2194,7 +2190,6 @@ miniinit.$(OBJEXT): {$(VPATH)}onigmo.h https://github.com/ruby/ruby/blob/trunk/common.mk#L2190
 miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
 miniinit.$(OBJEXT): {$(VPATH)}st.h
 miniinit.$(OBJEXT): {$(VPATH)}subst.h
-miniprelude.$(OBJEXT): $(hdrdir)/ruby/version.h
 miniprelude.$(OBJEXT): {$(VPATH)}iseq.h
 miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
 mjit.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
@@ -2234,7 +2229,6 @@ mjit_compile.$(OBJEXT): $(CCAN_DIR)/cont https://github.com/ruby/ruby/blob/trunk/common.mk#L2229
 mjit_compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
 mjit_compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
 mjit_compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-mjit_compile.$(OBJEXT): $(hdrdir)/ruby/version.h
 mjit_compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
 mjit_compile.$(OBJEXT): {$(VPATH)}config.h
 mjit_compile.$(OBJEXT): {$(VPATH)}defines.h
@@ -2369,7 +2363,6 @@ prelude.$(OBJEXT): $(CCAN_DIR)/container https://github.com/ruby/ruby/blob/trunk/common.mk#L2363
 prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
 prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
 prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-prelude.$(OBJEXT): $(hdrdir)/ruby/version.h
 prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
 prelude.$(OBJEXT): {$(VPATH)}config.h
 prelude.$(OBJEXT): {$(VPATH)}defines.h
@@ -2401,7 +2394,6 @@ proc.$(OBJEXT): $(CCAN_DIR)/container_of https://github.com/ruby/ruby/blob/trunk/common.mk#L2394
 proc.$(OBJEXT): $(CCAN_DIR)/list/list.h
 proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
 proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-proc.$(OBJEXT): $(hdrdir)/ruby/version.h
 proc.$(OBJEXT): $(top_srcdir)/include/ruby.h
 proc.$(OBJEXT): {$(VPATH)}config.h
 proc.$(OBJEXT): {$(VPATH)}defines.h
@@ -2608,7 +2600,6 @@ ruby.$(OBJEXT): $(CCAN_DIR)/container_of https://github.com/ruby/ruby/blob/trunk/common.mk#L2600
 ruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
 ruby.$(OBJEXT): $(CCAN_DIR)/str/str.h
 ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-ruby.$(OBJEXT): $(hdrdir)/ruby/version.h
 ruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
 ruby.$(OBJEXT): {$(VPATH)}config.h
 ruby.$(OBJEXT): {$(VPATH)}defines.h
@@ -2842,7 +2833,6 @@ thread.$(OBJEXT): $(CCAN_DIR)/container_ https://github.com/ruby/ruby/blob/trunk/common.mk#L2833
 thread.$(OBJEXT): $(CCAN_DIR)/list/list.h
 thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
 thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-thread.$(OBJEXT): $(hdrdir)/ruby/version.h
 thread.$(OBJEXT): $(top_srcdir)/include/ruby.h
 thread.$(OBJEXT): {$(VPATH)}config.h
 thread.$(OBJEXT): {$(VPATH)}debug.h
@@ -2985,7 +2975,6 @@ vm.$(OBJEXT): $(CCAN_DIR)/container_of/c https://github.com/ruby/ruby/blob/trunk/common.mk#L2975
 vm.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm.$(OBJEXT): $(hdrdir)/ruby/version.h
 vm.$(OBJEXT): $(top_srcdir)/include/ruby.h
 vm.$(OBJEXT): {$(VPATH)}config.h
 vm.$(OBJEXT): {$(VPATH)}constant.h
@@ -3039,7 +3028,6 @@ vm_backtrace.$(OBJEXT): $(CCAN_DIR)/cont https://github.com/ruby/ruby/blob/trunk/common.mk#L3028
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/version.h
 vm_backtrace.$(OBJEXT): $(top_srcdir)/include/ruby.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
 vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
@@ -3071,7 +3059,6 @@ vm_dump.$(OBJEXT): $(CCAN_DIR)/container https://github.com/ruby/ruby/blob/trunk/common.mk#L3059
 vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_dump.$(OBJEXT): $(hdrdir)/ruby/version.h
 vm_dump.$(OBJEXT): $(top_srcdir)/include/ruby.h
 vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
 vm_dump.$(OBJEXT): {$(VPATH)}config.h
@@ -3102,7 +3089,6 @@ vm_trace.$(OBJEXT): $(CCAN_DIR)/containe https://github.com/ruby/ruby/blob/trunk/common.mk#L3089
 vm_trace.$(OBJEXT): $(CCAN_DIR)/list/list.h
 vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h
 vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_trace.$(OBJEXT): $(hdrdir)/ruby/version.h
 vm_trace.$(OBJEXT): $(top_srcdir)/include/ruby.h
 vm_trace.$(OBJEXT): {$(VPATH)}config.h
 vm_trace.$(OBJEXT): {$(VPATH)}debug.h

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/