summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-12 01:55:58 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-12 01:55:58 +0000
commit724012a23d8274543002eb42ef71d87308481d40 (patch)
tree14171e0a8b8d6c6118626bd50b7eb2f1f868d121
parentf61df4b0a6e1a9b707f13961d77aebffe7644c9c (diff)
* 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
-rw-r--r--ChangeLog9
-rw-r--r--common.mk1
-rw-r--r--internal.h12
-rw-r--r--node.h9
-rw-r--r--variable.c1
5 files changed, 21 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ae5d7ddbc1..ad84bf9f444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 12 10:53:06 2015 Koichi Sasada <ko1@atdot.net>
+
+ * 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 <ko1@atdot.net>
* common.mk: remove unused dependency.
diff --git a/common.mk b/common.mk
index da1d72a2661..69585e55813 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 c7ee7316223..953db1b7924 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 cd6b92ab541..8ae0205d31e 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 1ce0d66a639..1845e38b602 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"