mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-01 15:03:39 +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:
@@ -31,7 +31,6 @@
|
||||
#include "gdelayedsettingsbackend.h"
|
||||
#include "gsettingsbackendinternal.h"
|
||||
#include "gsettings-mapping.h"
|
||||
#include "gio-marshal.h"
|
||||
#include "gsettingsschema.h"
|
||||
|
||||
#include <string.h>
|
||||
@@ -622,7 +621,7 @@ g_settings_class_init (GSettingsClass *class)
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GSettingsClass, change_event),
|
||||
g_signal_accumulator_true_handled, NULL,
|
||||
_gio_marshal_BOOL__POINTER_INT,
|
||||
g_cclosure_marshal_generic,
|
||||
G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_INT);
|
||||
|
||||
/**
|
||||
@@ -676,7 +675,7 @@ g_settings_class_init (GSettingsClass *class)
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GSettingsClass, writable_change_event),
|
||||
g_signal_accumulator_true_handled, NULL,
|
||||
_gio_marshal_BOOLEAN__UINT, G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
|
||||
g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
|
||||
|
||||
/**
|
||||
* GSettings:context:
|
||||
|
Reference in New Issue
Block a user