Revision

3415

Author

lsansonetti@apple.com

Date

2010-02-02 15:08:20 -0800 (Tue, 02 Feb 2010)

Log Message

fix bleeding edge build

Modified Paths

• MacRuby/trunk/array.c
• MacRuby/trunk/vm.cpp

Diff

--- MacRuby/trunk/array.c	2010-02-02 23:07:59 UTC (rev 3414)
+++ MacRuby/trunk/array.c	2010-02-02 23:08:20 UTC (rev 3415)
@@ -276,9 +276,12 @@
     }
     else {
 	mask = rb_objc_flag_get_mask((void *)ary);
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+	// XXX we shouldn't need to do that and follow the new hash refactoring
 	if (!_CFArrayIsMutable((void *)ary)) {
 	    mask |= FL_FREEZE;
 	}
+#endif
     }
     if ((mask & FL_FREEZE) == FL_FREEZE) {
 	rb_raise(rb_eRuntimeError, "can't modify frozen/immutable array");

--- MacRuby/trunk/vm.cpp	2010-02-02 23:07:59 UTC (rev 3414)
+++ MacRuby/trunk/vm.cpp	2010-02-02 23:08:20 UTC (rev 3415)
@@ -174,6 +174,17 @@
 	    return mm->getGOTBase();
 	}
 
+#if LLVM_TOT
+	void SetDlsymTable(void *ptr) {
+	    mm->SetDlsymTable(ptr);
+	}
+
+	void *getDlsymTable() const {
+	    return mm->getDlsymTable();
+	}
+#endif
+
+
 	uint8_t *startFunctionBody(const Function *F, 
 		uintptr_t &ActualSize) {
 	    return mm->startFunctionBody(F, ActualSize);