diff options
| author | Kalev Lember <kalev@smartlink.ee> | 2011-04-29 11:42:20 +0300 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2011-04-29 10:11:05 -0400 |
| commit | 95904a5a1bd497bc3f7606285301e1ef873ce7fc (patch) | |
| tree | ae1f0832735382478b492600ddf3228342b5b933 | |
| parent | 5642703b0edf146046213f47d7e725adb4b1af9f (diff) | |
| download | gtk+-95904a5a1bd497bc3f7606285301e1ef873ce7fc.tar.gz | |
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
| -rw-r--r-- | perf/Makefile.am | 4 | ||||
| -rw-r--r-- | perf/gtkwidgetprofiler.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index 9a35a17830..799b748eab 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -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 diff --git a/perf/gtkwidgetprofiler.c b/perf/gtkwidgetprofiler.c index 94b911acda..afbc53dd22 100644 --- a/perf/gtkwidgetprofiler.c +++ b/perf/gtkwidgetprofiler.c @@ -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, |