[cairo-commit] Branch '1.10' - 2 commits - build/configure.ac.system src/cairo-xcb-surface.c

[Chris Wilson]

 build/configure.ac.system |    2 +-
 src/cairo-xcb-surface.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d2f227e58516d7bb577d118893ff44bd44fde475
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 15 13:21:40 2011 +0000

    configure: Test for funlockfile
    
    cairo-trace already depended upon HAVE_FUNLOCKFILE for its
    thread-safety.
    
    [This is a candidate for 1.10.]
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/build/configure.ac.system b/build/configure.ac.system
index 564d66d..b405740 100644
--- a/build/configure.ac.system
+++ b/build/configure.ac.system
@@ -113,7 +113,7 @@ AC_CHECK_HEADER(fenv.h,
 
 dnl check for misc headers and functions
 AC_CHECK_HEADERS([libgen.h byteswap.h signal.h setjmp.h fenv.h])
-AC_CHECK_FUNCS([vasnprintf link ctime_r drand48 flockfile ffs])
+AC_CHECK_FUNCS([vasnprintf link ctime_r drand48 flockfile funlockfile ffs])
 
 dnl check for win32 headers (this detects mingw as well)
 AC_CHECK_HEADERS([windows.h], have_windows=yes, have_windows=no)
commit 60c6f658b19824de65c76dafdc439ba26fc4f7db
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 12 10:50:21 2010 +0000

    xcb: Compile fix when using xcb-drm
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index d852f50..c411f1f 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -189,7 +189,7 @@ _cairo_xcb_surface_create_similar (void			*abstract_other,
     if (other->drm != NULL) {
 	cairo_surface_t *drm;
 
-	drm = _cairo_drm_surface_create_similar (other->drm, content, width, height);
+	drm = other->drm->backend->create_similar (other->drm, content, width, height);
 	if (drm != NULL)
 	    return drm;
     }