luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop using glib-genmarshal at build time

Browse Source 
To help cross compilation, don't use glib-genmarshal in our
build.  This is easy now that we have g_cclosure_marshal_generic().

In gobject/, add gmarshal.[ch] to git (making the existing entry
points stubs).

In gio/, simply switch to using g_cclosure_marshal_generic().

https://bugzilla.gnome.org/show_bug.cgi?id=652168
This commit is contained in:
Colin Walters
2011-06-20 09:06:07 -04:00
parent 322e25b535
commit b74e2a720a
35 changed files with 565 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gdbusnamewatching.c
View File

@@ -30,7 +30,6 @@
#include "gdbuserror.h"
#include "gdbusprivate.h"
#include "gdbusconnection.h"
#include "gio-marshal.h"
#include "glibintl.h"
@@ -668,7 +667,7 @@ watch_name_data_new (GClosure *name_appeared_closure,
data->name_appeared_closure = g_closure_ref (name_appeared_closure);
g_closure_sink (name_appeared_closure);
if (G_CLOSURE_NEEDS_MARSHAL (name_appeared_closure))
g_closure_set_marshal (name_appeared_closure, _gio_marshal_VOID__STRING_STRING);
g_closure_set_marshal (name_appeared_closure, g_cclosure_marshal_generic);
}
if (name_vanished_closure != NULL)
@@ -676,7 +675,7 @@ watch_name_data_new (GClosure *name_appeared_closure,
data->name_vanished_closure = g_closure_ref (name_vanished_closure);
g_closure_sink (name_vanished_closure);
if (G_CLOSURE_NEEDS_MARSHAL (name_vanished_closure))
g_closure_set_marshal (name_vanished_closure, _gio_marshal_VOID__STRING);
g_closure_set_marshal (name_vanished_closure, g_cclosure_marshal_generic);
}
return data;