summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2011-07-01 10:12:15 +0200
committerUli Schlachter <psychon@znc.in>2011-07-01 10:15:46 +0200
commit4495e08e9e5fbcd386bf398097c8276f7f5c862d (patch)
treec18a261672af2322c595756ddca86f65a85d9005
parentea645913ba8739377ee2e2b51480310befc19b76 (diff)
xlib-xcb: Use slim_hidden_proto correctly
There are debug functions for setting the precision on a xlib device, so xlib-xcb must redirect that to the xcb backend, too. However this means that these public functions now are also called internally, thus we have to make them go through the slim_hidden_* macros. This commit fixes the following error from "make check": Checking .libs/libcairo.so for local PLT entries 00000000002bb6d8 000001e300000007 R_X86_64_JUMP_SLOT 000000000006d8a0 cairo_xcb_device_debug_set_precision + 0 00000000002bb750 0000025e00000007 R_X86_64_JUMP_SLOT 000000000006d8b0 cairo_xcb_device_debug_get_precision + 0 FAIL: check-plt.sh Signed-off-by: Uli Schlachter <psychon@znc.in>
-rw-r--r--src/cairo-xcb-connection.c6
-rw-r--r--src/cairo-xcb-private.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/cairo-xcb-connection.c b/src/cairo-xcb-connection.c
index 0c3bd5ae..de1bb179 100644
--- a/src/cairo-xcb-connection.c
+++ b/src/cairo-xcb-connection.c
@@ -910,6 +910,9 @@ cairo_xcb_device_debug_set_precision (cairo_device_t *device,
((cairo_xcb_connection_t *) device)->force_precision = precision;
}
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_def (cairo_xcb_device_debug_set_precision);
+#endif
int
cairo_xcb_device_debug_get_precision (cairo_device_t *device)
@@ -919,3 +922,6 @@ cairo_xcb_device_debug_get_precision (cairo_device_t *device)
return ((cairo_xcb_connection_t *) device)->force_precision;
}
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_def (cairo_xcb_device_debug_get_precision);
+#endif
diff --git a/src/cairo-xcb-private.h b/src/cairo-xcb-private.h
index 4704a25d..45b7bbee 100644
--- a/src/cairo-xcb-private.h
+++ b/src/cairo-xcb-private.h
@@ -760,6 +760,8 @@ slim_hidden_proto (cairo_xcb_surface_create);
slim_hidden_proto (cairo_xcb_surface_create_for_bitmap);
slim_hidden_proto (cairo_xcb_surface_create_with_xrender_format);
slim_hidden_proto (cairo_xcb_surface_set_size);
+slim_hidden_proto (cairo_xcb_device_debug_get_precision);
+slim_hidden_proto_no_warn (cairo_xcb_device_debug_set_precision);
#endif
#endif /* CAIRO_XCB_PRIVATE_H */