diff --git a/gicallableinfo.c b/gicallableinfo.c index 25372ffa0..95fa2fc2d 100644 --- a/gicallableinfo.c +++ b/gicallableinfo.c @@ -432,16 +432,16 @@ gi_type_info_extract_ffi_return_value (GITypeInfo *return_info, } gboolean -_g_callable_info_invoke (GIFunctionInfo *info, - gpointer function, - const GIArgument *in_args, - int n_in_args, - const GIArgument *out_args, - int n_out_args, - GIArgument *return_value, - gboolean is_method, - gboolean throws, - GError **error) +g_callable_info_invoke (GIFunctionInfo *info, + gpointer function, + const GIArgument *in_args, + int n_in_args, + const GIArgument *out_args, + int n_out_args, + GIArgument *return_value, + gboolean is_method, + gboolean throws, + GError **error) { ffi_cif cif; ffi_type *rtype; diff --git a/gicallableinfo.h b/gicallableinfo.h index 0c5fac794..48c08c413 100644 --- a/gicallableinfo.h +++ b/gicallableinfo.h @@ -55,6 +55,16 @@ GIArgInfo * g_callable_info_get_arg (GICallableInfo *info, void g_callable_info_load_arg (GICallableInfo *info, gint n, GIArgInfo *arg); +gboolean g_callable_info_invoke (GICallableInfo *info, + gpointer function, + const GIArgument *in_args, + int n_in_args, + const GIArgument *out_args, + int n_out_args, + GIArgument *return_value, + gboolean is_method, + gboolean throws, + GError **error); G_END_DECLS diff --git a/gifunctioninfo.c b/gifunctioninfo.c index 92f4ccd2d..a5858c76b 100644 --- a/gifunctioninfo.c +++ b/gifunctioninfo.c @@ -271,14 +271,14 @@ g_function_info_invoke (GIFunctionInfo *info, && (g_function_info_get_flags (info) & GI_FUNCTION_IS_CONSTRUCTOR) == 0; throws = g_function_info_get_flags (info) & GI_FUNCTION_THROWS; - return _g_callable_info_invoke ((GICallableInfo*) info, - func, - in_args, - n_in_args, - out_args, - n_out_args, - return_value, - is_method, - throws, - error); + return g_callable_info_invoke ((GICallableInfo*) info, + func, + in_args, + n_in_args, + out_args, + n_out_args, + return_value, + is_method, + throws, + error); } diff --git a/girepository-private.h b/girepository-private.h index 05b13626b..275776d8a 100644 --- a/girepository-private.h +++ b/girepository-private.h @@ -108,17 +108,6 @@ GIVFuncInfo * _g_base_info_find_vfunc (GIRealInfo *rinfo, gint n_vfuncs, const gchar *name); -gboolean _g_callable_info_invoke (GICallableInfo *info, - gpointer function, - const GIArgument *in_args, - int n_in_args, - const GIArgument *out_args, - int n_out_args, - GIArgument *return_value, - gboolean is_method, - gboolean throws, - GError **error); - extern ffi_status ffi_prep_closure_loc (ffi_closure *, ffi_cif *, void (*fun)(ffi_cif *, void *, void **, void *), diff --git a/givfuncinfo.c b/givfuncinfo.c index f80396c0c..462521b62 100644 --- a/givfuncinfo.c +++ b/givfuncinfo.c @@ -308,14 +308,14 @@ g_vfunc_info_invoke (GIVFuncInfo *info, if (*error != NULL) return FALSE; - return _g_callable_info_invoke ((GICallableInfo*) info, - func, - in_args, - n_in_args, - out_args, - n_out_args, - return_value, - TRUE, - FALSE, - error); + return g_callable_info_invoke ((GICallableInfo*) info, + func, + in_args, + n_in_args, + out_args, + n_out_args, + return_value, + TRUE, + FALSE, + error); }