From 262437b4570087e5743a3db71b550a1d6448401b Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 13 Oct 2018 16:21:06 +0000 Subject: Remove compile-time dependencies on ruby/version.h git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 14 -------------- iseq.h | 7 +++---- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/common.mk b/common.mk index b05f1dab09..41bb45cacb 100644 --- a/common.mk +++ b/common.mk @@ -1534,7 +1534,6 @@ compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h 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/container_of.h 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)/container_of/container_of.h 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/container_of.h 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 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)/container_of/container_of.h 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_of/container_of.h 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/container_of.h 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/container_of.h 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_of/container_of.h 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/container_of.h 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)/container_of/container_of.h 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_of/container_of.h 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)/container_of/container_of.h 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 diff --git a/iseq.h b/iseq.h index 442ad55c88..2d421a06d7 100644 --- a/iseq.h +++ b/iseq.h @@ -12,10 +12,9 @@ #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; -- cgit v1.2.3