[macruby-changes] [3889] MacRuby/trunk/gc.c

[source_changes at macosforge.org]

Revision: 3889
          http://trac.macosforge.org/projects/ruby/changeset/3889
Author:   lsansonetti at apple.com
Date:     2010-03-29 15:36:07 -0700 (Mon, 29 Mar 2010)
Log Message:
-----------
<rdar://problem/7752412>

Modified Paths:
--------------
    MacRuby/trunk/gc.c

Modified: MacRuby/trunk/gc.c
===================================================================
--- MacRuby/trunk/gc.c	2010-03-29 20:39:29 UTC (rev 3888)
+++ MacRuby/trunk/gc.c	2010-03-29 22:36:07 UTC (rev 3889)
@@ -853,7 +853,7 @@
     if (FIXNUM_P(ptr) || SYMBOL_P(ptr))
 	return ptr;
 
-    if (auto_zone_is_valid_pointer(auto_zone(), p0)) {
+    if (auto_zone_is_valid_pointer(__auto_zone, p0)) {
 	auto_memory_type_t type = 
 	    auto_zone_get_layout_type(__auto_zone, p0);
 	if ((type == AUTO_OBJECT_SCANNED || type == AUTO_OBJECT_UNSCANNED)
@@ -1023,7 +1023,11 @@
 {
     auto_collection_control_t *control;
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
     __auto_zone = auto_zone();
+#else
+    __auto_zone = objc_collectableZone();
+#endif
     
     if (__auto_zone == NULL) {
 	rb_objc_no_gc_error();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100329/2cea863a/attachment.html>