Revision: 3456 http://trac.macosforge.org/projects/ruby/changeset/3456 Author: martinlagardette@apple.com Date: 2010-02-08 15:49:25 -0800 (Mon, 08 Feb 2010) Log Message: ----------- - Removing an old limitation of 32bit macruby being unable to load rbo files - Should fix #579 Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2010-02-08 23:05:40 UTC (rev 3455) +++ MacRuby/trunk/load.c 2010-02-08 23:49:25 UTC (rev 3456) @@ -227,7 +227,7 @@ if (*name_cstr == '/' || *name_cstr == '.') { // Given name is an absolute path. name = rb_file_expand_path(name, Qnil); - return check_path(RSTRING_PTR(name), out, type); + return check_path(name_cstr, out, type); } // Given name is not an absolute path, we need to go through $:. @@ -392,11 +392,7 @@ const char *var_load_path = "$:"; ID id_load_path = rb_intern(var_load_path); -#if __LP64__ rbo_enabled = !ruby_is_miniruby && getenv("VM_DISABLE_RBO") == NULL; -#else - rbo_enabled = false; // rbo are only 64-bit for now. -#endif rb_define_virtual_variable("$:", rb_vm_load_path, 0); rb_alias_variable((rb_intern)("$-I"), id_load_path);
participants (1)
-
source_changes@macosforge.org