[macruby-changes] [4044] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4044
          http://trac.macosforge.org/projects/ruby/changeset/4044
Author:   lsansonetti at apple.com
Date:     2010-05-07 16:42:34 -0700 (Fri, 07 May 2010)
Log Message:
-----------
prefix rb2oc_exc_handler() with rb_ so that it gets exported in the dylib

Modified Paths:
--------------
    MacRuby/trunk/compiler.cpp
    MacRuby/trunk/vm.cpp

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2010-05-07 21:53:56 UTC (rev 4043)
+++ MacRuby/trunk/compiler.cpp	2010-05-07 23:42:34 UTC (rev 4044)
@@ -7490,9 +7490,9 @@
 
     Function *ruby2ocExcHandlerFunc = NULL;
     if (ruby2ocExcHandlerFunc == NULL) {
-	// void rb2oc_exc_handler(void);
+	// void rb_rb2oc_exc_handler(void);
 	ruby2ocExcHandlerFunc = cast<Function>(
-		module->getOrInsertFunction("rb2oc_exc_handler", VoidTy, NULL));
+		module->getOrInsertFunction("rb_rb2oc_exc_handler", VoidTy, NULL));
     }
     CallInst::Create(ruby2ocExcHandlerFunc, "", bb);
 

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2010-05-07 21:53:56 UTC (rev 4043)
+++ MacRuby/trunk/vm.cpp	2010-05-07 23:42:34 UTC (rev 4044)
@@ -3566,7 +3566,7 @@
 #if !__LP64__
 extern "C"
 void
-rb2oc_exc_handler(void)
+rb_rb2oc_exc_handler(void)
 {
     VALUE exc = GET_VM()->current_exception();
     if (exc != Qnil) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100507/da3e55bb/attachment.html>