[macruby-changes] [241] MacRuby/trunk/objc.m
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jun 1 18:29:01 PDT 2008
Revision: 241
http://trac.macosforge.org/projects/ruby/changeset/241
Author: lsansonetti at apple.com
Date: 2008-06-01 18:28:58 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
fix for #44, removed dead code
Modified Paths:
--------------
MacRuby/trunk/objc.m
Modified: MacRuby/trunk/objc.m
===================================================================
--- MacRuby/trunk/objc.m 2008-06-02 00:20:34 UTC (rev 240)
+++ MacRuby/trunk/objc.m 2008-06-02 01:28:58 UTC (rev 241)
@@ -2280,7 +2280,6 @@
class_count = count;
}
-static void dyld_add_image_cb(const struct mach_header* mh, intptr_t vmaddr_slide);
VALUE
rb_require_framework(int argc, VALUE *argv, VALUE recv)
{
@@ -2329,6 +2328,12 @@
frameworkName = [path stringByAppendingPathExtension:@"framework"];
+ path = [[[[NSBundle mainBundle] bundlePath]
+ stringByAppendingPathComponent:@"Contents/Frameworks"]
+ stringByAppendingPathComponent:frameworkName];
+ if ([fileManager fileExistsAtPath:path])
+ goto success;
+
dirs = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
pathDomainMask, YES);
for (i = 0, count = [dirs count]; i < count; i++) {
@@ -2620,14 +2625,6 @@
}
#if 0
-static void
-dyld_add_image_cb(const struct mach_header* mh, intptr_t vmaddr_slide)
-{
- reload_class_constants();
-}
-#endif
-
-#if 0
/* XXX the ivar cluster API is not used yet, and may not simply be used.
*/
#define IVAR_CLUSTER_NAME "__rivars__"
@@ -2947,10 +2944,6 @@
rb_install_objc_primitives();
rb_install_alloc_methods();
-#if 0 /* FIXME this doesn't seem to work as expected */
- _dyld_register_func_for_add_image(dyld_add_image_cb);
-#endif
-
rb_define_global_function("load_bridge_support_file", rb_objc_load_bs, 1);
{
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080601/6ee80b37/attachment.htm
More information about the macruby-changes
mailing list