forked from AuroraMiddleware/gtk
perf: Use different marshaller prefix than in gtk
Avoids multiple symbol definitions in gtk/gtkmarshalers.c and perf/marshalers.c when both objects are linked in. https://bugzilla.gnome.org/show_bug.cgi?id=648926
This commit is contained in:
parent
5642703b0e
commit
95904a5a1b
@ -57,12 +57,12 @@ marshalers.h: stamp-marshalers.h
|
||||
@true
|
||||
|
||||
stamp-marshalers.h: @REBUILD@ marshalers.list
|
||||
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \
|
||||
$(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \
|
||||
&& (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \
|
||||
&& rm -f xgen-gmlh \
|
||||
&& echo timestamp > $(@F)
|
||||
marshalers.c: @REBUILD@ marshalers.list
|
||||
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
|
||||
$(GLIB_GENMARSHAL) --prefix=_testperf_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
|
||||
&& cp xgen-gmlc marshalers.c \
|
||||
&& rm -f xgen-gmlc
|
||||
|
||||
|
@ -53,7 +53,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (GtkWidgetProfilerClass, create_widget),
|
||||
NULL, NULL,
|
||||
_gtk_marshal_OBJECT__VOID,
|
||||
_testperf_marshal_OBJECT__VOID,
|
||||
G_TYPE_OBJECT, 0);
|
||||
|
||||
signals[REPORT] =
|
||||
@ -62,7 +62,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
G_STRUCT_OFFSET (GtkWidgetProfilerClass, report),
|
||||
NULL, NULL,
|
||||
_gtk_marshal_VOID__ENUM_OBJECT_DOUBLE,
|
||||
_testperf_marshal_VOID__ENUM_OBJECT_DOUBLE,
|
||||
G_TYPE_NONE, 3,
|
||||
GTK_TYPE_WIDGET_PROFILER_REPORT,
|
||||
G_TYPE_OBJECT,
|
||||
|
Loading…
Reference in New Issue
Block a user