diff options
| author | Wayne Meissner <wmeissner@gmail.com> | 2009-09-22 15:47:26 +1000 |
|---|---|---|
| committer | Wayne Meissner <wmeissner@gmail.com> | 2009-09-22 15:47:26 +1000 |
| commit | 973060292566bce8834cf8210717daf9f8c8c3a1 (patch) | |
| tree | 255d452813b256201aa0a3416817b3245d793afa | |
| parent | 9bec34a3d9c91a57a4e1537e73f20d632167cd03 (diff) | |
| download | ffi-973060292566bce8834cf8210717daf9f8c8c3a1.tar.gz | |
Remove warnings when run with ruby -w
| -rw-r--r-- | ext/ffi_c/Function.c | 2 | ||||
| -rw-r--r-- | ext/ffi_c/Type.c | 2 | ||||
| -rw-r--r-- | ext/ffi_c/Variadic.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ext/ffi_c/Function.c b/ext/ffi_c/Function.c index 747b128..9ff2e50 100644 --- a/ext/ffi_c/Function.c +++ b/ext/ffi_c/Function.c @@ -263,7 +263,7 @@ function_attach(VALUE self, VALUE module, VALUE name) snprintf(var, sizeof(var), "@@%s", StringValueCStr(name)); rb_cv_set(module, var, self); - rb_define_module_function(module, StringValueCStr(name), + rb_define_singleton_method(module, StringValueCStr(name), rbffi_MethodHandle_CodeAddress(fn->methodHandle), -1); diff --git a/ext/ffi_c/Type.c b/ext/ffi_c/Type.c index d62fad8..0740ce7 100644 --- a/ext/ffi_c/Type.c +++ b/ext/ffi_c/Type.c @@ -265,7 +265,7 @@ rbffi_Type_Init(VALUE moduleFFI) rb_define_method(classType, "initialize", type_initialize, 1); rb_define_method(classType, "size", type_size, 0); rb_define_method(classType, "alignment", type_alignment, 0); - rb_define_method(classBuiltinType, "inspect", type_inspect, 0); + rb_define_method(classType, "inspect", type_inspect, 0); // Make Type::Builtin non-allocatable rb_undef_method(CLASS_OF(classBuiltinType), "new"); diff --git a/ext/ffi_c/Variadic.c b/ext/ffi_c/Variadic.c index fe06293..0395049 100644 --- a/ext/ffi_c/Variadic.c +++ b/ext/ffi_c/Variadic.c @@ -162,7 +162,7 @@ ffi_invoke(ffi_cif* cif, void* function, Type* returnType, void** ffiValues, } static VALUE -variadic_call(VALUE self, VALUE parameterTypes, VALUE parameterValues) +variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues) { VariadicInvoker* invoker; FFIStorage* params; @@ -254,7 +254,6 @@ rbffi_Variadic_Init(VALUE moduleFFI) rb_define_alloc_func(classVariadicInvoker, variadic_allocate); rb_define_method(classVariadicInvoker, "initialize", variadic_initialize, 4); - rb_define_method(classVariadicInvoker, "invoke", variadic_call, 2); - rb_define_alias(classVariadicInvoker, "call", "invoke"); + rb_define_method(classVariadicInvoker, "invoke", variadic_invoke, 2); } |