summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-03 09:58:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-03 09:58:32 +0000
commit7336f32c3b42e36f496972b73fd56f0205804dcb (patch)
treebedba6335bfebaed356ef6342d376f5391bb943e /load.c
parent140d43a73f2ae2969a3acedf87852c77a687408b (diff)
* load.c (ruby_init_ext): statically linked extensions have no
real path. [ruby-dev:41526] * vm.c (rb_vm_call_cfunc): add filepath argument. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/load.c b/load.c
index cdeff925ea..b4ec2d9b54 100644
--- a/load.c
+++ b/load.c
@@ -596,7 +596,7 @@ rb_require_safe(VALUE fname, int safe)
case 's':
handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext,
- path, 0, path);
+ path, 0, path, path);
rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
break;
}
@@ -643,7 +643,7 @@ ruby_init_ext(const char *name, void (*init)(void))
{
if (load_lock(name)) {
rb_vm_call_cfunc(rb_vm_top_self(), init_ext_call, (VALUE)init,
- 0, rb_str_new2(name));
+ 0, rb_str_new2(name), Qnil);
rb_provide(name);
load_unlock(name, 1);
}