[cairo-commit] 2 commits - src/cairo.c src/cairo-ft-font.c src/cairoint.h src/cairo-pattern.c src/check-def.sh

[Behdad Esfahbod]

 src/cairo-ft-font.c |    8 ++++----
 src/cairo-pattern.c |    2 +-
 src/cairo.c         |    6 +++---
 src/cairoint.h      |    6 +++---
 src/check-def.sh    |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 52cf67a8f2c2ca2c5c233756cfa7f56855e67f27
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jun 19 17:44:43 2008 -0400

    Rename cairo_* global vars to _cairo_*

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index ebf40df..7313984 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1281,7 +1281,7 @@ typedef struct _cairo_ft_scaled_font {
     cairo_ft_options_t ft_options;
 } cairo_ft_scaled_font_t;
 
-const cairo_scaled_font_backend_t cairo_ft_scaled_font_backend;
+const cairo_scaled_font_backend_t _cairo_ft_scaled_font_backend;
 
 /* The load flags passed to FT_Load_Glyph control aspects like hinting and
  * antialiasing. Here we compute them from the fields of a FcPattern.
@@ -1526,7 +1526,7 @@ _cairo_ft_scaled_font_create (cairo_ft_unscaled_font_t	 *unscaled,
     status = _cairo_scaled_font_init (&scaled_font->base,
 			              font_face,
 				      font_matrix, ctm, options,
-				      &cairo_ft_scaled_font_backend);
+				      &_cairo_ft_scaled_font_backend);
     if (status) {
 	_cairo_unscaled_font_destroy (&unscaled->base);
 	free (scaled_font);
@@ -1604,7 +1604,7 @@ _cairo_ft_scaled_font_create (cairo_ft_unscaled_font_t	 *unscaled,
 cairo_bool_t
 _cairo_scaled_font_is_ft (cairo_scaled_font_t *scaled_font)
 {
-    return scaled_font->backend == &cairo_ft_scaled_font_backend;
+    return scaled_font->backend == &_cairo_ft_scaled_font_backend;
 }
 
 static cairo_status_t
@@ -2209,7 +2209,7 @@ _cairo_ft_map_glyphs_to_unicode (void	                    *abstract_font,
     return CAIRO_STATUS_SUCCESS;
 }
 
-const cairo_scaled_font_backend_t cairo_ft_scaled_font_backend = {
+const cairo_scaled_font_backend_t _cairo_ft_scaled_font_backend = {
     CAIRO_FONT_TYPE_FT,
     _cairo_ft_scaled_font_create_toy,
     _cairo_ft_scaled_font_fini,
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index a42ecd7..a6c3ec3 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -50,7 +50,7 @@ static const cairo_solid_pattern_t _cairo_pattern_nil_null_pointer = {
       CAIRO_EXTEND_GRADIENT_DEFAULT },	/* extend */
 };
 
-const cairo_solid_pattern_t cairo_pattern_none = {
+const cairo_solid_pattern_t _cairo_pattern_none = {
     { CAIRO_PATTERN_TYPE_SOLID, 	/* type */
       CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
       CAIRO_STATUS_SUCCESS,		/* status */
diff --git a/src/cairo.c b/src/cairo.c
index 75f4dd8..7f8c5ff 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -682,7 +682,7 @@ cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue)
 	return;
 
     /* push the current pattern to the freed lists */
-    cairo_set_source (cr, (cairo_pattern_t *) &cairo_pattern_none);
+    cairo_set_source (cr, (cairo_pattern_t *) &_cairo_pattern_none);
 
     pattern = cairo_pattern_create_rgb (red, green, blue);
     cairo_set_source (cr, pattern);
@@ -719,7 +719,7 @@ cairo_set_source_rgba (cairo_t *cr,
 	return;
 
     /* push the current pattern to the freed lists */
-    cairo_set_source (cr, (cairo_pattern_t *) &cairo_pattern_none);
+    cairo_set_source (cr, (cairo_pattern_t *) &_cairo_pattern_none);
 
     pattern = cairo_pattern_create_rgba (red, green, blue, alpha);
     cairo_set_source (cr, pattern);
@@ -762,7 +762,7 @@ cairo_set_source_surface (cairo_t	  *cr,
 	return;
 
     /* push the current pattern to the freed lists */
-    cairo_set_source (cr, (cairo_pattern_t *) &cairo_pattern_none);
+    cairo_set_source (cr, (cairo_pattern_t *) &_cairo_pattern_none);
 
     pattern = cairo_pattern_create_for_surface (surface);
 
diff --git a/src/cairoint.h b/src/cairoint.h
index 218afc0..fe58ff8 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -465,7 +465,7 @@ struct _cairo_font_face_backend {
 /* concrete font backends */
 #if CAIRO_HAS_FT_FONT
 
-extern const cairo_private struct _cairo_scaled_font_backend cairo_ft_scaled_font_backend;
+extern const cairo_private struct _cairo_scaled_font_backend _cairo_ft_scaled_font_backend;
 
 #endif
 
@@ -808,7 +808,7 @@ typedef struct _cairo_solid_pattern {
 } cairo_solid_pattern_t;
 
 extern const cairo_private cairo_solid_pattern_t _cairo_pattern_nil;
-extern const cairo_private cairo_solid_pattern_t cairo_pattern_none;
+extern const cairo_private cairo_solid_pattern_t _cairo_pattern_none;
 
 typedef struct _cairo_surface_pattern {
     cairo_pattern_t base;
@@ -905,7 +905,7 @@ typedef struct _cairo_traps {
 #elif CAIRO_HAS_FT_FONT
 
 #define CAIRO_FONT_FAMILY_DEFAULT CAIRO_FT_FONT_FAMILY_DEFAULT
-#define CAIRO_SCALED_FONT_BACKEND_DEFAULT &cairo_ft_scaled_font_backend
+#define CAIRO_SCALED_FONT_BACKEND_DEFAULT &_cairo_ft_scaled_font_backend
 
 #else
 
commit 9388cc71db8d6e019061f289c0a72ebaa3432c8c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jun 19 17:43:52 2008 -0400

    [src/check-def.sh] Make sure no global variables are named cairo_*
    
    Even if they are marked cairo_private.

diff --git a/src/check-def.sh b/src/check-def.sh
index 04880e1..9fd2baf 100755
--- a/src/check-def.sh
+++ b/src/check-def.sh
@@ -21,7 +21,7 @@ fi
 
 get_cairo_syms='nm "$so" | grep " [BCDGINRSTVW] " | cut -d" " -f3'
 if [ "`uname -s`" = "Linux" ]; then
-       get_cairo_syms='objdump -t "$so" | grep "^[^ ]* [^l.*]*[.]" | sed "s/.* //"'
+       get_cairo_syms='( objdump -t "$so" | grep "^[^ ]* [^l.*]*[.]"; objdump -t "$so" | grep "[.]hidden.*\\<cairo"; ) | sed "s/.* //"'
 fi
 
 defs="cairo.def"