diff options
Diffstat (limited to 'devel/dbus/files/patch-glib_dbus-gvalue.c')
| -rw-r--r-- | devel/dbus/files/patch-glib_dbus-gvalue.c | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/devel/dbus/files/patch-glib_dbus-gvalue.c b/devel/dbus/files/patch-glib_dbus-gvalue.c index d0144b9e4c90..ef0bfc32dd36 100644 --- a/devel/dbus/files/patch-glib_dbus-gvalue.c +++ b/devel/dbus/files/patch-glib_dbus-gvalue.c @@ -1,34 +1,24 @@ ---- glib/dbus-gvalue.c.orig Sat Jul 2 01:08:35 2005 -+++ glib/dbus-gvalue.c Sat Jul 2 01:10:19 2005 -@@ -213,15 +213,6 @@ dbus_g_value_types_init (void) +--- glib/dbus-gvalue.c.orig Mon Jul 11 12:12:49 2005 ++++ glib/dbus-gvalue.c Sat Jul 16 02:15:19 2005 +@@ -189,6 +189,10 @@ dbus_g_value_types_init (void) { static gboolean types_initialized; -- -- if (types_initialized) -- return; -- -- g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter)); -- -- dbus_g_type_specialized_init (); -- dbus_g_type_specialized_builtins_init (); -- - static const DBusGTypeMarshalVtable basic_vtable = { - marshal_basic, - demarshal_basic -@@ -234,6 +225,15 @@ dbus_g_value_types_init (void) - marshal_map, - demarshal_ghashtable - }; -+ -+ if (types_initialized) -+ return; -+ -+ g_assert (sizeof (DBusGValueIterator) >= sizeof (DBusMessageIter)); -+ -+ dbus_g_type_specialized_init (); -+ dbus_g_type_specialized_builtins_init (); -+ ++ static const DBusGTypeMarshalVtable basic_vtable = { ++ marshal_basic, ++ demarshal_basic ++ }; + + if (types_initialized) + return; +@@ -196,10 +200,6 @@ dbus_g_value_types_init (void) + dbus_g_type_specialized_init (); + dbus_g_type_specialized_builtins_init (); + +- static const DBusGTypeMarshalVtable basic_vtable = { +- marshal_basic, +- demarshal_basic +- }; /* Register basic types */ { |