summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 11:20:45 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 11:20:45 +0000
commit681c87e7b7f4e1358d8d8836424f7255fd056455 (patch)
treea3f7e6608bd343a501e92a8b7464df3c55bc066b
parent83332a9c1eb62690bedd882e955460a45509a0c8 (diff)
downloadruby-681c87e7b7f4e1358d8d8836424f7255fd056455.tar.gz
ruby-681c87e7b7f4e1358d8d8836424f7255fd056455.tar.xz
ruby-681c87e7b7f4e1358d8d8836424f7255fd056455.zip
* gc.c (RVALUE): in RVALUE and RBasic, flags must be the same type.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 90f7c1f57..b8130f5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 25 20:18:44 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c (RVALUE): in RVALUE and RBasic, flags must be the same type.
+
Mon Jun 25 18:02:55 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/pty/extconf.rb: skip wince and win64.
diff --git a/gc.c b/gc.c
index 10cb5c6a3..4360a535f 100644
--- a/gc.c
+++ b/gc.c
@@ -95,7 +95,7 @@ int ruby_gc_debug_indent = 0;
typedef struct RVALUE {
union {
struct {
- unsigned long flags; /* always 0 for freed obj */
+ VALUE flags; /* always 0 for freed obj */
struct RVALUE *next;
} free;
struct RBasic basic;