ruby-changes:24668
From: nobu <ko1@a...>
Date: Fri, 17 Aug 2012 13:13:15 +0900 (JST)
Subject: [ruby-changes:24668] nobu:r36719 (trunk): * id.c: move vm_opts.h dependency.
nobu 2012-08-17 13:12:12 +0900 (Fri, 17 Aug 2012) New Revision: 36719 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36719 Log: * id.c: move vm_opts.h dependency. Modified files: trunk/common.mk trunk/id.c trunk/template/id.h.tmpl Index: common.mk =================================================================== --- common.mk (revision 36718) +++ common.mk (revision 36719) @@ -616,7 +616,7 @@ {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \ {$(VPATH)}subst.h ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h -ID_H_INCLUDES = {$(VPATH)}id.h {$(VPATH)}vm_opts.h +ID_H_INCLUDES = {$(VPATH)}id.h VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \ {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}atomic.h \ $(ID_H_INCLUDES) @@ -694,7 +694,7 @@ $(ENCODING_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}regenc.h \ {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \ {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \ - {$(VPATH)}parse.h \ + {$(VPATH)}parse.h {$(VPATH)}vm_opts.h \ {$(VPATH)}internal.h proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \ $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \ @@ -781,7 +781,7 @@ debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \ $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \ {$(VPATH)}util.h {$(VPATH)}debug.h -id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES) +id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) $(ID_H_INCLUDES) {$(VPATH)}vm_opts.h vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \ $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) \ {$(VPATH)}internal.h {$(VPATH)}iseq.h Index: id.c =================================================================== --- id.c (revision 36718) +++ id.c (revision 36719) @@ -13,6 +13,8 @@ #include "id.h" +#include "vm_opts.h" /* for SUPPORT_JOKE */ + static void Init_id(void) { Index: template/id.h.tmpl =================================================================== --- template/id.h.tmpl (revision 36718) +++ template/id.h.tmpl (revision 36719) @@ -65,8 +65,6 @@ #include "parse.h" #endif -#include "vm_opts.h" /* for SUPPORT_JOKE */ - #define symIFUNC ID2SYM(idIFUNC) #define symCFUNC ID2SYM(idCFUNC) @@ -109,16 +107,12 @@ % method_ids.each do |token| t<%=token%>, % end -#if SUPPORT_JOKE tBitblt, tAnswer, -#endif tLAST_ID, #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL) -#if SUPPORT_JOKE TOKEN2ID(Bitblt), TOKEN2ID(Answer), -#endif % method_ids.each do |token| TOKEN2ID(<%=token%>), % end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/