mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-01 06:33:41 +02:00
Stop using glib-genmarshal at build time
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:
@@ -30,7 +30,6 @@
|
||||
#include "gsettings.h"
|
||||
|
||||
#include "gioenumtypes.h"
|
||||
#include "gio-marshal.h"
|
||||
#include "gioenums.h"
|
||||
#include "gfile.h"
|
||||
|
||||
@@ -607,7 +606,7 @@ g_application_class_init (GApplicationClass *class)
|
||||
g_application_signals[SIGNAL_OPEN] =
|
||||
g_signal_new ("open", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GApplicationClass, open),
|
||||
NULL, NULL, _gio_marshal_VOID__POINTER_INT_STRING,
|
||||
NULL, NULL, g_cclosure_marshal_generic,
|
||||
G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_STRING);
|
||||
|
||||
/**
|
||||
@@ -627,7 +626,7 @@ g_application_class_init (GApplicationClass *class)
|
||||
g_signal_new ("command-line", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GApplicationClass, command_line),
|
||||
g_signal_accumulator_first_wins, NULL,
|
||||
_gio_marshal_INT__OBJECT,
|
||||
g_cclosure_marshal_generic,
|
||||
G_TYPE_INT, 1, G_TYPE_APPLICATION_COMMAND_LINE);
|
||||
|
||||
g_type_class_add_private (class, sizeof (GApplicationPrivate));
|
||||
|
Reference in New Issue
Block a user