summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2011-01-31 22:39:39 +0100
committerUli Schlachter <psychon@znc.in>2011-01-31 22:42:24 +0100
commit0e08e7adfc33eb048c7e88bb22a0ac35b1a14a72 (patch)
tree1be047bb14373cdffd982a95157e490aca16d121 /src
parent2e81f79e95a60a706f517b1bd989039b302dba8a (diff)
XCB: Fix build with xcb-shm disabled
The function _cairo_xcb_shm_image_create is defined and needed even when XCB-SHM is disabled. In this case it just falls back to an image surface. Thanks to Benjamin Otte for noticing this. cairo-xcb-surface-render.c: In function ‘_render_to_picture’: cairo-xcb-surface-render.c:749: error: implicit declaration of function ‘_cairo_xcb_shm_image_create’ cairo-xcb-surface-render.c:749: warning: nested extern declaration of ‘_cairo_xcb_shm_image_create’ Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'src')
-rw-r--r--src/cairo-xcb-private.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cairo-xcb-private.h b/src/cairo-xcb-private.h
index 0692f598e..6bf6ef858 100644
--- a/src/cairo-xcb-private.h
+++ b/src/cairo-xcb-private.h
@@ -533,7 +533,6 @@ _cairo_xcb_connection_poly_fill_rectangle (cairo_xcb_connection_t *connection,
uint32_t num_rectangles,
xcb_rectangle_t *rectangles);
-#if CAIRO_HAS_XCB_SHM_FUNCTIONS
cairo_private cairo_status_t
_cairo_xcb_shm_image_create (cairo_xcb_connection_t *connection,
pixman_format_code_t pixman_format,
@@ -541,6 +540,7 @@ _cairo_xcb_shm_image_create (cairo_xcb_connection_t *connection,
cairo_image_surface_t **image_out,
cairo_xcb_shm_info_t **shm_info_out);
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
cairo_private uint32_t
_cairo_xcb_connection_shm_attach (cairo_xcb_connection_t *connection,
uint32_t id,