* internal.h, node.h: move a definition of `struct rb_global_entry'

  and related functions from node.h to internal.h.
* variable.c: remove unused include pragma.
* common.mk: remove unused dependency.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ae5d7ddbc..ad84bf9f44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 12 10:53:06 2015  Koichi Sasada  <[email protected]>
+
+	* internal.h, node.h: move a definition of `struct rb_global_entry'
+	  and related functions from node.h to internal.h.
+
+	* variable.c: remove unused include pragma.
+
+	* common.mk: remove unused dependency.
+
 Thu Mar 12 10:32:39 2015  Koichi Sasada  <[email protected]>
 
 	* common.mk: remove unused dependency.
diff --git a/common.mk b/common.mk
index da1d72a266..69585e5581 100644
--- a/common.mk
+++ b/common.mk
@@ -2279,7 +2279,6 @@ variable.$(OBJEXT): {$(VPATH)}intern.h
 variable.$(OBJEXT): {$(VPATH)}internal.h
 variable.$(OBJEXT): {$(VPATH)}io.h
 variable.$(OBJEXT): {$(VPATH)}missing.h
-variable.$(OBJEXT): {$(VPATH)}node.h
 variable.$(OBJEXT): {$(VPATH)}oniguruma.h
 variable.$(OBJEXT): {$(VPATH)}st.h
 variable.$(OBJEXT): {$(VPATH)}subst.h
diff --git a/internal.h b/internal.h
index c7ee731622..953db1b792 100644
--- a/internal.h
+++ b/internal.h
@@ -615,6 +615,18 @@ struct MEMO {
 #define NEW_MEMO_FOR(type, value) \
   ((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value))
 
+/* global variable */
+
+struct rb_global_entry {
+    struct rb_global_variable *var;
+    ID id;
+};
+
+struct rb_global_entry *rb_global_entry(ID);
+VALUE rb_gvar_get(struct rb_global_entry *);
+VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
+VALUE rb_gvar_defined(struct rb_global_entry *);
+
 struct vtm; /* defined by timev.h */
 
 /* array.c */
diff --git a/node.h b/node.h
index cd6b92ab54..8ae0205d31 100644
--- a/node.h
+++ b/node.h
@@ -481,15 +481,6 @@ void rb_gc_free_node(VALUE obj);
 size_t rb_node_memsize(VALUE obj);
 VALUE rb_gc_mark_node(NODE *obj);
 
-struct rb_global_entry {
-    struct rb_global_variable *var;
-    ID id;
-};
-
-struct rb_global_entry *rb_global_entry(ID);
-VALUE rb_gvar_get(struct rb_global_entry *);
-VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
-VALUE rb_gvar_defined(struct rb_global_entry *);
 const struct kwtable *rb_reserved_word(const char *, unsigned int);
 
 struct rb_args_info {
diff --git a/variable.c b/variable.c
index 1ce0d66a63..1845e38b60 100644
--- a/variable.c
+++ b/variable.c
@@ -14,7 +14,6 @@
 #include "internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
-#include "node.h"
 #include "constant.h"
 #include "id.h"