[cairo-commit] 2 commits - src/cairoint.h src/cairo-spans-private.h test/any2ppm.c

[Bryce Harrington]

 src/cairo-spans-private.h |    2 +-
 src/cairoint.h            |    8 ++++----
 test/any2ppm.c            |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f574fec8d2d1f83525fd7e4dbb266b6e5091627d
Author: Ravi Nanjundappa <nravi.n at samsung.com>
Date:   Mon May 19 14:59:29 2014 +0530

    src : Fix warn_unused_result warnings from gcc
    
    Fix 'unused-result' warning messages by
    - replacing cairo_private to cairo_private_no_warn in the
      declaration of the cairo private apis '_cairo_surface_unmap_image',
      '_cairo_polygon_add_line', '_cairo_polygon_add_external_edge' and
      '_cairo_polygon_add_contour'
    - removing cairo_warn for 'render_rows' member function pointer in
      'struct _cairo_span_renderer'
    
    Signed-off-by: Ravi Nanjundappa <nravi.n at samsung.com>

diff --git a/src/cairo-spans-private.h b/src/cairo-spans-private.h
index c42b5af..b158f4d 100644
--- a/src/cairo-spans-private.h
+++ b/src/cairo-spans-private.h
@@ -53,7 +53,7 @@ struct _cairo_span_renderer {
 
     /* Render the spans on row y of the destination by whatever compositing
      * method is required. */
-    cairo_warn cairo_status_t
+    cairo_status_t
     (*render_rows) (void *abstract_renderer,
 		    int y, int height,
 		    const cairo_half_open_span_t	*coverages,
diff --git a/src/cairoint.h b/src/cairoint.h
index 44e0ec5..080bb5d 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1321,7 +1321,7 @@ cairo_private cairo_image_surface_t *
 _cairo_surface_map_to_image (cairo_surface_t  *surface,
 			     const cairo_rectangle_int_t *extents);
 
-cairo_private cairo_int_status_t
+cairo_private_no_warn cairo_int_status_t
 _cairo_surface_unmap_image (cairo_surface_t       *surface,
 			    cairo_image_surface_t *image);
 
@@ -1609,18 +1609,18 @@ _cairo_polygon_limit_to_clip (cairo_polygon_t *polygon,
 cairo_private void
 _cairo_polygon_fini (cairo_polygon_t *polygon);
 
-cairo_private cairo_status_t
+cairo_private_no_warn cairo_status_t
 _cairo_polygon_add_line (cairo_polygon_t *polygon,
 			 const cairo_line_t *line,
 			 int top, int bottom,
 			 int dir);
 
-cairo_private cairo_status_t
+cairo_private_no_warn cairo_status_t
 _cairo_polygon_add_external_edge (void *polygon,
 				  const cairo_point_t *p1,
 				  const cairo_point_t *p2);
 
-cairo_private cairo_status_t
+cairo_private_no_warn cairo_status_t
 _cairo_polygon_add_contour (cairo_polygon_t *polygon,
 			    const cairo_contour_t *contour);
 
commit 5741a7f2cab3548467a020c89bb7363d398f9c0d
Author: Eric Le Bihan <eric.le.bihan.dev at free.fr>
Date:   Fri May 9 21:22:04 2014 +0200

    test: fix build of any2ppm if fork not available
    
    The test program any2ppm can run as daemon. This feature can be disabled
    at compile time, if the required headers are not present. However the
    support for fork() is not checked.
    
    This patch fixes this issue.
    
    Signed-off-by: Eric Le Bihan <eric.le.bihan.dev at free.fr>

diff --git a/test/any2ppm.c b/test/any2ppm.c
index b125496..3e0806f 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -92,8 +92,10 @@
 #define SOCKET_PATH "./.any2ppm"
 #define TIMEOUT 60000 /* 60 seconds */
 
+#if HAVE_FORK
 #define CAN_RUN_AS_DAEMON 1
 #endif
+#endif
 
 #define ARRAY_LENGTH(A) (sizeof (A) / sizeof (A[0]))