diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-06-23 10:09:30 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-06-24 11:57:22 +0200 |
| commit | f21ac5b13b4a2a5455349da29529692a02c2a5e0 (patch) | |
| tree | b6050f4212d9abd2382fb09ff579f8c6e90c3947 /perf | |
| parent | 0740c8e4f37e5ff17d2bf294c37c438de0be0a41 (diff) | |
error: Do not define _cairo_error twice
cairo-perf-trace uses cairo-hash.c, which calls _cairo_error.
Instead of redefining it in cairo-perf-trace.c it can be abstracted in
a separate source which is directly included in the build of
cairo-perf-trace.
This avoids visibility issues when compiling cairo-perf-trace with a
statically linked cairo library on architectures which do not support
hidden visibility (example: win32).
Diffstat (limited to 'perf')
| -rw-r--r-- | perf/Makefile.am | 1 | ||||
| -rw-r--r-- | perf/cairo-perf-trace.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/perf/Makefile.am b/perf/Makefile.am index f4e4cf49..1e1bf5bc 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -81,6 +81,7 @@ libcairoperf_la_SOURCES = \ cairo_perf_trace_SOURCES = \ cairo-perf-trace.c \ + ../src/cairo-error.c \ ../src/cairo-hash.c if CAIRO_HAS_WIN32_SURFACE cairo_perf_trace_SOURCES += cairo-perf-win32.c diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c index b3d22cf3..2d454cb7 100644 --- a/perf/cairo-perf-trace.c +++ b/perf/cairo-perf-trace.c @@ -884,9 +884,3 @@ main (int argc, return 0; } - -cairo_status_t -_cairo_error (cairo_status_t status) -{ - return status; -} |