[cairo-commit] src/cairo-xcb-private.h

Uli Schlachter psychon at kemper.freedesktop.org
Mon Jan 31 13:43:14 PST 2011


 src/cairo-xcb-private.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e08e7adfc33eb048c7e88bb22a0ac35b1a14a72
Author: Uli Schlachter <psychon at znc.in>
Date:   Mon Jan 31 22:39:39 2011 +0100

    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 at znc.in>

diff --git a/src/cairo-xcb-private.h b/src/cairo-xcb-private.h
index 0692f59..6bf6ef8 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,


More information about the cairo-commit mailing list