callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: Use different marshaller prefix than in gtk

Browse Source 
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:
Kalev Lember
2011-04-29 11:42:20 +03:00
committed by Colin Walters
parent 5642703b0e
commit 95904a5a1b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
perf/Makefile.am
View File

@ -57,12 +57,12 @@ marshalers.h: stamp-marshalers.h
@true @true
stamp-marshalers.h: @REBUILD@ marshalers.list 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) \ && (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \
&& rm -f xgen-gmlh \ && rm -f xgen-gmlh \
&& echo timestamp > $(@F) && echo timestamp > $(@F)
marshalers.c: @REBUILD@ marshalers.list 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 \ && cp xgen-gmlc marshalers.c \
&& rm -f xgen-gmlc && rm -f xgen-gmlc

4
perf/gtkwidgetprofiler.c
View File

@ -53,7 +53,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetProfilerClass, create_widget), G_STRUCT_OFFSET (GtkWidgetProfilerClass, create_widget),
NULL, NULL, NULL, NULL,
_gtk_marshal_OBJECT__VOID, _testperf_marshal_OBJECT__VOID,
G_TYPE_OBJECT, 0); G_TYPE_OBJECT, 0);
signals[REPORT] = signals[REPORT] =
@ -62,7 +62,7 @@ gtk_widget_profiler_class_init (GtkWidgetProfilerClass *class)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkWidgetProfilerClass, report), G_STRUCT_OFFSET (GtkWidgetProfilerClass, report),
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__ENUM_OBJECT_DOUBLE, _testperf_marshal_VOID__ENUM_OBJECT_DOUBLE,
G_TYPE_NONE, 3, G_TYPE_NONE, 3,
GTK_TYPE_WIDGET_PROFILER_REPORT, GTK_TYPE_WIDGET_PROFILER_REPORT,
G_TYPE_OBJECT, G_TYPE_OBJECT,