[cairo-commit] 3 commits - src/cairo.c src/cairo-gl.h src/cairoint.h src/Makefile.am.analysis

[Andrea Canciani]

 src/Makefile.am.analysis |    6 +++---
 src/cairo-gl.h           |    2 +-
 src/cairo.c              |    1 +
 src/cairoint.h           |    3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 90156f6ab7b94e9e576e34f6a2d8cb809242f8d0
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Mon Mar 21 09:58:29 2011 +0100

    Fix visibility issues found by make check

diff --git a/src/cairo.c b/src/cairo.c
index e1a8e91..c19a1e9 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -3075,6 +3075,7 @@ cairo_set_font_matrix (cairo_t		    *cr,
     if (unlikely (status))
 	_cairo_set_error (cr, status);
 }
+slim_hidden_def (cairo_set_font_matrix);
 
 /**
  * cairo_get_font_matrix
diff --git a/src/cairoint.h b/src/cairoint.h
index 3e338ff..8d9bd44 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -2240,7 +2240,7 @@ _cairo_gradient_pattern_fit_to_range (const cairo_gradient_pattern_t *gradient,
 				      cairo_matrix_t                 *out_matrix,
 				      cairo_circle_double_t	      out_circle[2]);
 
-cairo_bool_t
+cairo_private cairo_bool_t
 _cairo_radial_pattern_focus_is_inside (const cairo_radial_pattern_t *radial);
 
 cairo_private cairo_bool_t
@@ -2462,6 +2462,7 @@ slim_hidden_proto (cairo_scaled_font_status);
 slim_hidden_proto (cairo_scaled_font_get_user_data);
 slim_hidden_proto (cairo_scaled_font_set_user_data);
 slim_hidden_proto (cairo_scaled_font_text_to_glyphs);
+slim_hidden_proto (cairo_set_font_matrix);
 slim_hidden_proto (cairo_set_font_options);
 slim_hidden_proto (cairo_set_font_size);
 slim_hidden_proto (cairo_set_line_cap);
commit 7ea7a7714b1937f4a772cab9b8a67ea04b729ff8
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Mar 15 23:40:35 2011 +0100

    Fix warning by check-doc-syntax
    
    The check-doc-syntax step of 'make check' reports:
    
    ./cairo-gl.h: * cairo_device_t, which represents an GL context created by the user.
    Error: some function names in the docs are not followed by parentheses.
    Fix this by searching for the following regexp in the above files:
        '^[^:]*:[/ ][*]\(\|[  ].*\)\([^#']\|^\)\<\(cairo_[][<>/0-9a-z_]*\>[^][<>(]\)'

diff --git a/src/cairo-gl.h b/src/cairo-gl.h
index 9efde43..d23cea7 100644
--- a/src/cairo-gl.h
+++ b/src/cairo-gl.h
@@ -43,7 +43,7 @@
  *
  * Cairo-gl allows interoperability with other GL rendering through GL
  * context sharing.  Cairo-gl surfaces are created in reference to a
- * cairo_device_t, which represents an GL context created by the user.
+ * #cairo_device_t, which represents an GL context created by the user.
  * When that GL context is created with its sharePtr set to another
  * context (or vice versa), its objects (textures backing cairo-gl
  * surfaces) can be accessed in the other OpenGL context.  This allows
commit e4c042d0594bf1f3403fee5a8ed11f8473c3cf26
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Mar 15 23:08:16 2011 +0100

    Improve headers-standalone target
    
    make check reports multiple:
    warning: control reaches end of non-void function
    
    and on MacOS X it complains that:
    error: unable to open executable ''

diff --git a/src/Makefile.am.analysis b/src/Makefile.am.analysis
index f10a03f..fab4cf7 100644
--- a/src/Makefile.am.analysis
+++ b/src/Makefile.am.analysis
@@ -25,9 +25,9 @@ headers-standalone: $(enabled_cairo_headers) $(enabled_cairo_private)
 	@status=true; for f in $(enabled_cairo_headers) $(enabled_cairo_private); do \
 		echo "  CHECK $$f"; \
 		echo "#include \"$(srcdir)/$$f\"" > headers-standalone-tmp.c; \
-		echo "int main(int argc, char * argv[]) {}" >> headers-standalone-tmp.c; \
-		$(COMPILE) -o /dev/null headers-standalone-tmp.c || status=false; \
-		$(RM) headers-standalone-tmp.c; \
+		echo "int main(int argc, char * argv[]) { return 0; }" >> headers-standalone-tmp.c; \
+		$(COMPILE) -o headers-standalone-tmp headers-standalone-tmp.c || status=false; \
+		$(RM) headers-standalone-tmp headers-standalone-tmp.c; \
 	done; $$status
 	@touch $@
 CLEANFILES += headers-standalone