From c00090a2ce3633da759d8d6479c503842e81b8be Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 12 Feb 2012 10:24:31 +0000 Subject: Refresh marshallers for mingw (bzr r10962) --- src/helper/sp-marshal.cpp.mingw | 283 +++++++--------------------------------- src/helper/sp-marshal.h.mingw | 85 ++---------- 2 files changed, 60 insertions(+), 308 deletions(-) diff --git a/src/helper/sp-marshal.cpp.mingw b/src/helper/sp-marshal.cpp.mingw index 241d930af..f50b8cf4f 100644 --- a/src/helper/sp-marshal.cpp.mingw +++ b/src/helper/sp-marshal.cpp.mingw @@ -1,5 +1,5 @@ - #include "helper/sp-marshal.h" + #include @@ -22,6 +22,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -45,53 +46,11 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ -/* NONE:NONE (sp-marshal.list:2) */ - -/* NONE:UINT (sp-marshal.list:3) */ - -/* NONE:POINTER (sp-marshal.list:4) */ - -/* NONE:POINTER,BOOLEAN (sp-marshal.list:5) */ -void -sp_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer data1, - gpointer arg_1, - gboolean arg_2, - gpointer data2); - register GMarshalFunc_VOID__POINTER_BOOLEAN callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__POINTER_BOOLEAN) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_boolean (param_values + 2), - data2); -} - -/* NONE:POINTER,UINT (sp-marshal.list:6) */ +/* NONE:POINTER,UINT (sp-marshal.list:2) */ void sp_marshal_VOID__POINTER_UINT (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -128,194 +87,7 @@ sp_marshal_VOID__POINTER_UINT (GClosure *closure, data2); } -/* NONE:POINTER,DOUBLE (sp-marshal.list:7) */ -void -sp_marshal_VOID__POINTER_DOUBLE (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__POINTER_DOUBLE) (gpointer data1, - gpointer arg_1, - gdouble arg_2, - gpointer data2); - register GMarshalFunc_VOID__POINTER_DOUBLE callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__POINTER_DOUBLE) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_double (param_values + 2), - data2); -} - -/* NONE:DOUBLE,DOUBLE (sp-marshal.list:8) */ -void -sp_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1, - gdouble arg_1, - gdouble arg_2, - gpointer data2); - register GMarshalFunc_VOID__DOUBLE_DOUBLE callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__DOUBLE_DOUBLE) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_double (param_values + 1), - g_marshal_value_peek_double (param_values + 2), - data2); -} - -/* NONE:STRING,BOOL (sp-marshal.list:9) */ -void -sp_marshal_VOID__STRING_BOOLEAN (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, - gpointer arg_1, - gboolean arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_BOOLEAN callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_boolean (param_values + 2), - data2); -} - -/* BOOLEAN:NONE (sp-marshal.list:10) */ -void -sp_marshal_BOOLEAN__VOID (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, - gpointer data2); - register GMarshalFunc_BOOLEAN__VOID callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 1); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - data2); - - g_value_set_boolean (return_value, v_return); -} - -/* BOOLEAN:UINT (sp-marshal.list:11) */ -void -sp_marshal_BOOLEAN__UINT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__UINT) (gpointer data1, - guint arg_1, - gpointer data2); - register GMarshalFunc_BOOLEAN__UINT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 2); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_BOOLEAN__UINT) (marshal_data ? marshal_data : cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_uint (param_values + 1), - data2); - - g_value_set_boolean (return_value, v_return); -} - -/* BOOLEAN:POINTER (sp-marshal.list:12) */ +/* BOOLEAN:POINTER (sp-marshal.list:3) */ void sp_marshal_BOOLEAN__POINTER (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -354,7 +126,7 @@ sp_marshal_BOOLEAN__POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:POINTER,UINT (sp-marshal.list:13) */ +/* BOOLEAN:POINTER,UINT (sp-marshal.list:4) */ void sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -395,7 +167,7 @@ sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* BOOLEAN:POINTER,POINTER (sp-marshal.list:14) */ +/* BOOLEAN:POINTER,POINTER (sp-marshal.list:5) */ void sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -436,7 +208,7 @@ sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* INT:POINTER,POINTER (sp-marshal.list:15) */ +/* INT:POINTER,POINTER (sp-marshal.list:6) */ void sp_marshal_INT__POINTER_POINTER (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -477,7 +249,7 @@ sp_marshal_INT__POINTER_POINTER (GClosure *closure, g_value_set_int (return_value, v_return); } -/* DOUBLE:POINTER,UINT (sp-marshal.list:16) */ +/* DOUBLE:POINTER,UINT (sp-marshal.list:7) */ void sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -518,3 +290,40 @@ sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, g_value_set_double (return_value, v_return); } +/* VOID:INT,INT (sp-marshal.list:8) */ +void +sp_marshal_VOID__INT_INT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, + gint arg_1, + gint arg_2, + gpointer data2); + register GMarshalFunc_VOID__INT_INT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_int (param_values + 1), + g_marshal_value_peek_int (param_values + 2), + data2); +} + diff --git a/src/helper/sp-marshal.h.mingw b/src/helper/sp-marshal.h.mingw index 9a97e06aa..790e7862b 100644 --- a/src/helper/sp-marshal.h.mingw +++ b/src/helper/sp-marshal.h.mingw @@ -6,28 +6,7 @@ G_BEGIN_DECLS -/* NONE:NONE (sp-marshal.list:2) */ -#define sp_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID -#define sp_marshal_NONE__NONE sp_marshal_VOID__VOID - -/* NONE:UINT (sp-marshal.list:3) */ -#define sp_marshal_VOID__UINT g_cclosure_marshal_VOID__UINT -#define sp_marshal_NONE__UINT sp_marshal_VOID__UINT - -/* NONE:POINTER (sp-marshal.list:4) */ -#define sp_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER -#define sp_marshal_NONE__POINTER sp_marshal_VOID__POINTER - -/* NONE:POINTER,BOOLEAN (sp-marshal.list:5) */ -extern void sp_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define sp_marshal_NONE__POINTER_BOOLEAN sp_marshal_VOID__POINTER_BOOLEAN - -/* NONE:POINTER,UINT (sp-marshal.list:6) */ +/* NONE:POINTER,UINT (sp-marshal.list:2) */ extern void sp_marshal_VOID__POINTER_UINT (GClosure *closure, GValue *return_value, guint n_param_values, @@ -36,51 +15,7 @@ extern void sp_marshal_VOID__POINTER_UINT (GClosure *closure, gpointer marshal_data); #define sp_marshal_NONE__POINTER_UINT sp_marshal_VOID__POINTER_UINT -/* NONE:POINTER,DOUBLE (sp-marshal.list:7) */ -extern void sp_marshal_VOID__POINTER_DOUBLE (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define sp_marshal_NONE__POINTER_DOUBLE sp_marshal_VOID__POINTER_DOUBLE - -/* NONE:DOUBLE,DOUBLE (sp-marshal.list:8) */ -extern void sp_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define sp_marshal_NONE__DOUBLE_DOUBLE sp_marshal_VOID__DOUBLE_DOUBLE - -/* NONE:STRING,BOOL (sp-marshal.list:9) */ -extern void sp_marshal_VOID__STRING_BOOLEAN (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define sp_marshal_NONE__STRING_BOOL sp_marshal_VOID__STRING_BOOLEAN - -/* BOOLEAN:NONE (sp-marshal.list:10) */ -extern void sp_marshal_BOOLEAN__VOID (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define sp_marshal_BOOLEAN__NONE sp_marshal_BOOLEAN__VOID - -/* BOOLEAN:UINT (sp-marshal.list:11) */ -extern void sp_marshal_BOOLEAN__UINT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* BOOLEAN:POINTER (sp-marshal.list:12) */ +/* BOOLEAN:POINTER (sp-marshal.list:3) */ extern void sp_marshal_BOOLEAN__POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -88,7 +23,7 @@ extern void sp_marshal_BOOLEAN__POINTER (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* BOOLEAN:POINTER,UINT (sp-marshal.list:13) */ +/* BOOLEAN:POINTER,UINT (sp-marshal.list:4) */ extern void sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, GValue *return_value, guint n_param_values, @@ -96,7 +31,7 @@ extern void sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* BOOLEAN:POINTER,POINTER (sp-marshal.list:14) */ +/* BOOLEAN:POINTER,POINTER (sp-marshal.list:5) */ extern void sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -104,7 +39,7 @@ extern void sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* INT:POINTER,POINTER (sp-marshal.list:15) */ +/* INT:POINTER,POINTER (sp-marshal.list:6) */ extern void sp_marshal_INT__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -112,7 +47,7 @@ extern void sp_marshal_INT__POINTER_POINTER (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* DOUBLE:POINTER,UINT (sp-marshal.list:16) */ +/* DOUBLE:POINTER,UINT (sp-marshal.list:7) */ extern void sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, GValue *return_value, guint n_param_values, @@ -120,6 +55,14 @@ extern void sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); +/* VOID:INT,INT (sp-marshal.list:8) */ +extern void sp_marshal_VOID__INT_INT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + G_END_DECLS #endif /* __sp_marshal_MARSHAL_H__ */ -- cgit v1.2.3