summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-28 20:08:56 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-28 20:08:56 +0000
commit205e69064605f0c0954750334e366386c1e7e999 (patch)
tree827c06e5ee065b472e1a3a4683e55c6d7eb8283c
parenteb9f446ebf64dde94f69daa5cdbc2d84ce68eb4d (diff)
include/ruby/ruby.h: hide Symbol internals
This is too new to be a compatibility problem. * include/ruby/ruby.h: Hide Symbol internals. (struct RSymbol): moved to internal.h (RSYMBOL): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/ruby.h7
-rw-r--r--internal.h8
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1df5d5b606..452a7adc4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 29 05:05:29 2014 Eric Wong <e@80x24.org>
+
+ * include/ruby/ruby.h: Hide Symbol internals.
+ (struct RSymbol): moved to internal.h
+ (RSYMBOL): ditto
+
Thu May 29 00:28:56 2014 Tanaka Akira <akr@fsij.org>
* ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index a39b958617..7c7cb67d99 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -952,12 +952,6 @@ struct RComplex {
#define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r))
#define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i))
-struct RSymbol {
- struct RBasic basic;
- VALUE fstr;
- ID type;
-};
-
struct RData {
struct RBasic basic;
void (*dmark)(void*);
@@ -1093,7 +1087,6 @@ struct RStruct {
#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
#define RFILE(obj) (R_CAST(RFile)(obj))
#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
-#define RSYMBOL(obj) (R_CAST(RSymbol)(obj))
#define FL_SINGLETON FL_USER0
#define FL_WB_PROTECTED (((VALUE)1)<<5)
diff --git a/internal.h b/internal.h
index 071f3ed6af..c4a2d8d4b1 100644
--- a/internal.h
+++ b/internal.h
@@ -412,6 +412,14 @@ struct RRational {
#define RRATIONAL(obj) (R_CAST(RRational)(obj))
+struct RSymbol {
+ struct RBasic basic;
+ VALUE fstr;
+ ID type;
+};
+
+#define RSYMBOL(obj) (R_CAST(RSymbol)(obj))
+
/* class.c */
void rb_class_subclass_add(VALUE super, VALUE klass);
void rb_class_remove_from_super_subclasses(VALUE);