diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-17 04:12:12 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-17 04:12:12 +0000 |
commit | 42dc1e5ef8f8c003ef0cb5b78102044d2e800c44 (patch) | |
tree | 5d8ea1d8e90ac4aa02b86d90a642fd12a4a91f0a | |
parent | 4a097d2e3e37e66f0cac4db3d4916d673fcb0129 (diff) |
* id.c: move vm_opts.h dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | common.mk | 6 | ||||
-rw-r--r-- | id.c | 2 | ||||
-rw-r--r-- | template/id.h.tmpl | 6 |
3 files changed, 5 insertions, 9 deletions
@@ -616,7 +616,7 @@ RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ {$(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 @@ parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \ $(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 @@ vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \ 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 @@ -13,6 +13,8 @@ #include "id.h" +#include "vm_opts.h" /* for SUPPORT_JOKE */ + static void Init_id(void) { diff --git a/template/id.h.tmpl b/template/id.h.tmpl index 52c3685913..f6ebf9fba5 100644 --- a/template/id.h.tmpl +++ b/template/id.h.tmpl @@ -65,8 +65,6 @@ method_ids = %w[ #include "parse.h" #endif -#include "vm_opts.h" /* for SUPPORT_JOKE */ - #define symIFUNC ID2SYM(idIFUNC) #define symCFUNC ID2SYM(idCFUNC) @@ -109,16 +107,12 @@ enum ruby_method_ids { % 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 |