commit 3bd09b5fa602962b9f0445295984f7e17f8995d5
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Dec 6 14:01:46 2012 -0500
gmarshal.h: replace "extern" with GLIB_AVAILABLE_IN_ALL
This was one of the few public header files that was properly declaring
functions as "extern". Switch it to use GLIB_AVAILABLE_IN_ALL instead.
https://bugzilla.gnome.org/show_bug.cgi?id=688681
gobject/gmarshal.h | 616 ++++++++++++++++++++++++++++------------------------
1 files changed, 330 insertions(+), 286 deletions(-)
---
diff --git a/gobject/gmarshal.h b/gobject/gmarshal.h
index 0c21be6..d4fd76a 100644
--- a/gobject/gmarshal.h
+++ b/gobject/gmarshal.h
@@ -5,335 +5,379 @@
G_BEGIN_DECLS
/* VOID:VOID (./gmarshal.list:6) */
-extern void g_cclosure_marshal_VOID__VOID (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__VOID (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:BOOLEAN (./gmarshal.list:7) */
-extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:CHAR (./gmarshal.list:8) */
-extern void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:UCHAR (./gmarshal.list:9) */
-extern void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:INT (./gmarshal.list:10) */
-extern void g_cclosure_marshal_VOID__INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__INTv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__INTv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:UINT (./gmarshal.list:11) */
-extern void g_cclosure_marshal_VOID__UINT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UINT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:LONG (./gmarshal.list:12) */
-extern void g_cclosure_marshal_VOID__LONG (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__LONG (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:ULONG (./gmarshal.list:13) */
-extern void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:ENUM (./gmarshal.list:14) */
-extern void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:FLAGS (./gmarshal.list:15) */
-extern void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:FLOAT (./gmarshal.list:16) */
-extern void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:DOUBLE (./gmarshal.list:17) */
-extern void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:STRING (./gmarshal.list:18) */
-extern void g_cclosure_marshal_VOID__STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:PARAM (./gmarshal.list:19) */
-extern void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:BOXED (./gmarshal.list:20) */
-extern void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:POINTER (./gmarshal.list:21) */
-extern void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:OBJECT (./gmarshal.list:22) */
-extern void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:VARIANT (./gmarshal.list:23) */
-extern void g_cclosure_marshal_VOID__VARIANT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__VARIANT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* VOID:UINT,POINTER (./gmarshal.list:26) */
-extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* BOOL:FLAGS (./gmarshal.list:27) */
-extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
/* STRING:OBJECT,POINTER (./gmarshal.list:28) */
-extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
/* BOOL:BOXED,BOXED (./gmarshal.list:29) */
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-extern void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
- GValue *return_value,
- gpointer instance,
- va_list args,
- gpointer marshal_data,
- int n_params,
- GType *param_types);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+GLIB_AVAILABLE_IN_ALL
+void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
+ GValue *return_value,
+ gpointer instance,
+ va_list args,
+ gpointer marshal_data,
+ int n_params,
+ GType *param_types);
#define g_cclosure_marshal_BOOL__BOXED_BOXED g_cclosure_marshal_BOOLEAN__BOXED_BOXED
G_END_DECLS