[cairo-commit] 3 commits - src/cairo-backend-private.h src/cairo-mempool-private.h src/cairo-pattern-private.h src/cairo-xcb-surface.c

[Uli Schlachter]

 src/cairo-backend-private.h |    1 +
 src/cairo-mempool-private.h |    2 ++
 src/cairo-pattern-private.h |    3 ---
 src/cairo-xcb-surface.c     |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8d86ea4dcbefc982e4a694f1d8e90a90b3695c10
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Sep 15 14:37:51 2012 +0200

    xcb: Fix a warn_unused_result warning
    
    cairo-xcb-surface.c: In function '_drawable_changed':
    cairo-xcb-surface.c:1434:39: warning: ignoring return value of '_cairo_surface_begin_modification', declared with attribute warn_unused_result [-Wunused-result]
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 9928f66..25de4b8 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1431,7 +1431,8 @@ slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
 static void
 _drawable_changed (cairo_xcb_surface_t *surface)
 {
-    _cairo_surface_begin_modification (&surface->base);
+    _cairo_surface_set_error (&surface->base,
+	    _cairo_surface_begin_modification (&surface->base));
     _cairo_boxes_clear (&surface->fallback_damage);
     cairo_surface_destroy (&surface->fallback->base);
 
commit d6253dd53127368797dfd43084450e70b4921f77
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Sep 15 14:36:06 2012 +0200

    Remove an unimplemented function declaration
    
    This was added in commit 2458120dee350cd1b49f999f64b17a895a4b6607.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-pattern-private.h b/src/cairo-pattern-private.h
index ddbb2c8..dfd843f 100644
--- a/src/cairo-pattern-private.h
+++ b/src/cairo-pattern-private.h
@@ -230,9 +230,6 @@ _cairo_pattern_init_for_surface (cairo_surface_pattern_t *pattern,
 cairo_private void
 _cairo_pattern_fini (cairo_pattern_t *pattern);
 
-cairo_private void
-_cairo_pattern_fini_snapshot (cairo_pattern_t *pattern);
-
 cairo_private cairo_pattern_t *
 _cairo_pattern_create_solid (const cairo_color_t	*color);
 
commit 08e3f4614b688331534d72f46c9c3e9f292d0216
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Sep 15 14:33:54 2012 +0200

    Fix make check
    
    The inline functions in cairo-backend-private.h tried to dereference a cairo_t,
    which wasn't defined. Fix this by including cairo-private.h.
    
    In cairo-mempool-private.h, size_t is used but stddef.h is not included.
    
    Fixes:
    
      CHECK cairo-backend-private.h
    In file included from headers-standalone-tmp.c:1:0:
    ./cairo-backend-private.h: In function ‘_cairo_backend_to_user’:
    ./cairo-backend-private.h:179:7: error: dereferencing pointer to incomplete type
    ./cairo-backend-private.h: In function ‘_cairo_backend_to_user_distance’:
    ./cairo-backend-private.h:185:7: error: dereferencing pointer to incomplete type
    ./cairo-backend-private.h: In function ‘_cairo_user_to_backend’:
    ./cairo-backend-private.h:191:7: error: dereferencing pointer to incomplete type
    ./cairo-backend-private.h: In function ‘_cairo_user_to_backend_distance’:
    ./cairo-backend-private.h:197:7: error: dereferencing pointer to incomplete type
      CHECK cairo-mempool-private.h
    In file included from headers-standalone-tmp.c:1:0:
    ./cairo-mempool-private.h:61:5: error: unknown type name ‘size_t’
    ./cairo-mempool-private.h:62:5: error: unknown type name ‘size_t’
    ./cairo-mempool-private.h:68:8: error: unknown type name ‘size_t’
    ./cairo-mempool-private.h:73:44: error: unknown type name ‘size_t’
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-backend-private.h b/src/cairo-backend-private.h
index cd626b8..b05eca5 100644
--- a/src/cairo-backend-private.h
+++ b/src/cairo-backend-private.h
@@ -37,6 +37,7 @@
 #define CAIRO_BACKEND_PRIVATE_H
 
 #include "cairo-types-private.h"
+#include "cairo-private.h"
 
 typedef enum _cairo_backend_type {
     CAIRO_TYPE_DEFAULT,
diff --git a/src/cairo-mempool-private.h b/src/cairo-mempool-private.h
index 4435a5a..a09f6ce 100644
--- a/src/cairo-mempool-private.h
+++ b/src/cairo-mempool-private.h
@@ -40,6 +40,8 @@
 #include "cairo-compiler-private.h"
 #include "cairo-error-private.h"
 
+#include <stddef.h> /* for size_t */
+
 CAIRO_BEGIN_DECLS
 
 typedef struct _cairo_mempool cairo_mempool_t;