Give cairo_public an empty definition by default.

Add new cairo_public macro before every public function call prototype.

13 files changed, 218 insertions, 196 deletions

diff --git a/ChangeLog b/ChangeLog
index 03aa61e9..5dcbaaef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-09-07  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-features.h.in: Give cairo_public an empty definition
+	by default.
+	
+	* src/cairo-ft.h:
+	* src/cairo-glitz.h:
+	* src/cairo-pdf.h:
+	* src/cairo-ps.h:
+	* src/cairo-quartz.h:
+	* src/cairo-win32.h:
+	* src/cairo-xcb-xrender.h:
+	* src/cairo-xcb.h:
+	* src/cairo-xlib-xrender.h:
+	* src/cairo-xlib.h:
+	* src/cairo.h: Add new cairo_public macro before every public
+	function call prototype.
+
 2005-09-07  T Rowley  <tim.rowley@gmail.com>
 
 	* src/cairo-atsui-font.c (_cairo_atsui_font_show_glyphs):
diff --git a/src/cairo-features.h.in b/src/cairo-features.h.in
index d4c6fa71..0291c0a1 100644
--- a/src/cairo-features.h.in
+++ b/src/cairo-features.h.in
@@ -45,6 +45,10 @@
 # define CAIRO_END_DECLS
 #endif
 
+#ifndef cairo_public
+# define cairo_public
+#endif
+
 #define CAIRO_VERSION_MAJOR @CAIRO_VERSION_MAJOR@
 #define CAIRO_VERSION_MINOR @CAIRO_VERSION_MINOR@
 #define CAIRO_VERSION_MICRO @CAIRO_VERSION_MICRO@
diff --git a/src/cairo-ft.h b/src/cairo-ft.h
index 3bdbae1b..b59435fe 100644
--- a/src/cairo-ft.h
+++ b/src/cairo-ft.h
@@ -49,21 +49,21 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_font_face_t *
+cairo_public cairo_font_face_t *
 cairo_ft_font_face_create_for_pattern (FcPattern *pattern);
 
-void
+cairo_public void
 cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 				  FcPattern                  *pattern);
 
-cairo_font_face_t *
+cairo_public cairo_font_face_t *
 cairo_ft_font_face_create_for_ft_face (FT_Face         face,
 				       int             load_flags);
 
-FT_Face
+cairo_public FT_Face
 cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font);
 
-void
+cairo_public void
 cairo_ft_scaled_font_unlock_face (cairo_scaled_font_t *scaled_font);
 
 CAIRO_END_DECLS
diff --git a/src/cairo-glitz.h b/src/cairo-glitz.h
index f5b4f281..622fda2a 100644
--- a/src/cairo-glitz.h
+++ b/src/cairo-glitz.h
@@ -45,7 +45,7 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_glitz_surface_create (glitz_surface_t *surface);
 
 CAIRO_END_DECLS
diff --git a/src/cairo-pdf.h b/src/cairo-pdf.h
index 61bf7a84..d611fb2c 100644
--- a/src/cairo-pdf.h
+++ b/src/cairo-pdf.h
@@ -43,18 +43,18 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_pdf_surface_create (const char   *filename,
 			  double	width_in_points,
 			  double	height_in_points);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_pdf_surface_create_for_stream (cairo_write_func_t	write_func,
 				     void	       *closure,
 				     double		width_in_points,
 				     double		height_in_points);
 
-void
+cairo_public void
 cairo_pdf_surface_set_dpi (cairo_surface_t     *surface,
 			   double		x_dpi,
 			   double		y_dpi);
diff --git a/src/cairo-ps.h b/src/cairo-ps.h
index ea2d53d0..036c4b2c 100644
--- a/src/cairo-ps.h
+++ b/src/cairo-ps.h
@@ -47,18 +47,18 @@ CAIRO_BEGIN_DECLS
 
 /* PS-surface functions */
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_ps_surface_create (const char *filename,
 			 double	     width_in_points,
 			 double	     height_in_points);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_ps_surface_create_for_stream (cairo_write_func_t	write_func,
 				    void	       *closure,
 				    double		width_in_points,
 				    double		height_in_points);
 
-void
+cairo_public void
 cairo_ps_surface_set_dpi (cairo_surface_t      *surface,
 			  double		x_dpi,
 			  double		y_dpi);
diff --git a/src/cairo-quartz.h b/src/cairo-quartz.h
index dd929b29..02992dce 100644
--- a/src/cairo-quartz.h
+++ b/src/cairo-quartz.h
@@ -45,7 +45,7 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_quartz_surface_create (CGContextRef    context,
 			     int	     width,
 			     int	     height);
diff --git a/src/cairo-win32.h b/src/cairo-win32.h
index 93983456..8d43bb74 100644
--- a/src/cairo-win32.h
+++ b/src/cairo-win32.h
@@ -44,20 +44,20 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_win32_surface_create (HDC hdc);
 
-cairo_font_face_t *
+cairo_public cairo_font_face_t *
 cairo_win32_font_face_create_for_logfontw (LOGFONTW *logfont);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_win32_scaled_font_select_font (cairo_scaled_font_t *scaled_font,
 				     HDC                  hdc);
 
-void
+cairo_public void
 cairo_win32_scaled_font_done_font (cairo_scaled_font_t *scaled_font);
 
-double
+cairo_public double
 cairo_win32_scaled_font_get_metrics_factor (cairo_scaled_font_t *scaled_font);
 
 CAIRO_END_DECLS
diff --git a/src/cairo-xcb-xrender.h b/src/cairo-xcb-xrender.h
index ef4baa99..bb2a79af 100644
--- a/src/cairo-xcb-xrender.h
+++ b/src/cairo-xcb-xrender.h
@@ -46,7 +46,7 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xcb_surface_create_with_xrender_format (XCBConnection	    *c,
 					      XCBDRAWABLE	     drawable,
 					      XCBRenderPICTFORMINFO *format,
diff --git a/src/cairo-xcb.h b/src/cairo-xcb.h
index 17dfafa0..a39d7b60 100644
--- a/src/cairo-xcb.h
+++ b/src/cairo-xcb.h
@@ -45,20 +45,20 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xcb_surface_create (XCBConnection *c,
 			  XCBDRAWABLE	 drawable,
 			  XCBVISUALTYPE *visual,
 			  int		 width,
 			  int		 height);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xcb_surface_create_for_bitmap (XCBConnection *c,
 				     XCBPIXMAP	    bitmap,
 				     int	    width,
 				     int	    height);
 
-void
+cairo_public void
 cairo_xcb_surface_set_size (cairo_surface_t *surface,
 			    int		     width,
 			    int		     height);
diff --git a/src/cairo-xlib-xrender.h b/src/cairo-xlib-xrender.h
index 71b23977..cc1064fc 100644
--- a/src/cairo-xlib-xrender.h
+++ b/src/cairo-xlib-xrender.h
@@ -45,7 +45,7 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xlib_surface_create_with_xrender_format (Display		 *dpy,
                                                Drawable		  drawable,
 					       Screen		 *screen,
diff --git a/src/cairo-xlib.h b/src/cairo-xlib.h
index 5cdf1378..078fe1d5 100644
--- a/src/cairo-xlib.h
+++ b/src/cairo-xlib.h
@@ -45,26 +45,26 @@
 
 CAIRO_BEGIN_DECLS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xlib_surface_create (Display     *dpy,
 			   Drawable	drawable,
 			   Visual      *visual,
 			   int		width,
 			   int		height);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_xlib_surface_create_for_bitmap (Display  *dpy,
 				      Pixmap	bitmap,
 				      Screen	*screen,
 				      int	width,
 				      int	height);
 
-void
+cairo_public void
 cairo_xlib_surface_set_size (cairo_surface_t *surface,
 			     int              width,
 			     int              height);
 
-void
+cairo_public void
 cairo_xlib_surface_set_drawable (cairo_surface_t *surface,
 				 Drawable	  drawable,
 				 int              width,
diff --git a/src/cairo.h b/src/cairo.h
index 267ec7f3..0dfc5bbc 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -52,10 +52,10 @@ CAIRO_BEGIN_DECLS
 	CAIRO_VERSION_MINOR,                    \
 	CAIRO_VERSION_MICRO)
 
-int
+cairo_public int
 cairo_version (void);
 
-const char*
+cairo_public const char*
 cairo_version_string (void);
 
 /**
@@ -237,26 +237,26 @@ typedef cairo_status_t (*cairo_read_func_t) (void		*closure,
 					     unsigned int	length);
 
 /* Functions for manipulating state objects */
-cairo_t *
+cairo_public cairo_t *
 cairo_create (cairo_surface_t *target);
 
-cairo_t *
+cairo_public cairo_t *
 cairo_reference (cairo_t *cr);
 
-void
+cairo_public void
 cairo_destroy (cairo_t *cr);
 
-void
+cairo_public void
 cairo_save (cairo_t *cr);
 
-void
+cairo_public void
 cairo_restore (cairo_t *cr);
 
 /* XXX: I want to rethink this API
-void
+cairo_public void
 cairo_push_group (cairo_t *cr);
 
-void
+cairo_public void
 cairo_pop_group (cairo_t *cr);
 */
 
@@ -282,27 +282,27 @@ typedef enum _cairo_operator {
     CAIRO_OPERATOR_SATURATE
 } cairo_operator_t;
 
-void
+cairo_public void
 cairo_set_operator (cairo_t *cr, cairo_operator_t op);
 
-void
+cairo_public void
 cairo_set_source (cairo_t *cr, cairo_pattern_t *source);
 
-void
+cairo_public void
 cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue);
 
-void
+cairo_public void
 cairo_set_source_rgba (cairo_t *cr,
 		       double red, double green, double blue,
 		       double alpha);
 
-void
+cairo_public void
 cairo_set_source_surface (cairo_t	  *cr,
 			  cairo_surface_t *surface,
 			  double	   x,
 			  double	   y);
 
-void
+cairo_public void
 cairo_set_tolerance (cairo_t *cr, double tolerance);
 
 /**
@@ -325,7 +325,7 @@ typedef enum _cairo_antialias {
     CAIRO_ANTIALIAS_SUBPIXEL
 } cairo_antialias_t;
 
-void
+cairo_public void
 cairo_set_antialias (cairo_t *cr, cairo_antialias_t antialias);
 
 /**
@@ -354,10 +354,10 @@ typedef enum _cairo_fill_rule {
     CAIRO_FILL_RULE_EVEN_ODD
 } cairo_fill_rule_t;
 
-void
+cairo_public void
 cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule);
 
-void
+cairo_public void
 cairo_set_line_width (cairo_t *cr, double width);
 
 
@@ -375,7 +375,7 @@ typedef enum _cairo_line_cap {
     CAIRO_LINE_CAP_SQUARE
 } cairo_line_cap_t;
 
-void
+cairo_public void
 cairo_set_line_cap (cairo_t *cr, cairo_line_cap_t line_cap);
 
 typedef enum _cairo_line_join {
@@ -384,173 +384,173 @@ typedef enum _cairo_line_join {
     CAIRO_LINE_JOIN_BEVEL
 } cairo_line_join_t;
 
-void
+cairo_public void
 cairo_set_line_join (cairo_t *cr, cairo_line_join_t line_join);
 
-void
+cairo_public void
 cairo_set_dash (cairo_t	*cr,
 		double	*dashes,
 		int	 num_dashes,
 		double	 offset);
 
-void
+cairo_public void
 cairo_set_miter_limit (cairo_t *cr, double limit);
 
-void
+cairo_public void
 cairo_translate (cairo_t *cr, double tx, double ty);
 
-void
+cairo_public void
 cairo_scale (cairo_t *cr, double sx, double sy);
 
-void
+cairo_public void
 cairo_rotate (cairo_t *cr, double angle);
 
-void
+cairo_public void
 cairo_transform (cairo_t	      *cr,
 		 const cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_set_matrix (cairo_t	       *cr,
 		  const cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_identity_matrix (cairo_t *cr);
 
-void
+cairo_public void
 cairo_user_to_device (cairo_t *cr, double *x, double *y);
 
-void
+cairo_public void
 cairo_user_to_device_distance (cairo_t *cr, double *dx, double *dy);
 
-void
+cairo_public void
 cairo_device_to_user (cairo_t *cr, double *x, double *y);
 
-void
+cairo_public void
 cairo_device_to_user_distance (cairo_t *cr, double *dx, double *dy);
 
 /* Path creation functions */
-void
+cairo_public void
 cairo_new_path (cairo_t *cr);
 
-void
+cairo_public void
 cairo_move_to (cairo_t *cr, double x, double y);
 
-void
+cairo_public void
 cairo_line_to (cairo_t *cr, double x, double y);
 
-void
+cairo_public void
 cairo_curve_to (cairo_t *cr,
 		double x1, double y1,
 		double x2, double y2,
 		double x3, double y3);
 
-void
+cairo_public void
 cairo_arc (cairo_t *cr,
 	   double xc, double yc,
 	   double radius,
 	   double angle1, double angle2);
 
-void
+cairo_public void
 cairo_arc_negative (cairo_t *cr,
 		    double xc, double yc,
 		    double radius,
 		    double angle1, double angle2);
 
 /* XXX: NYI
-void
+cairo_public void
 cairo_arc_to (cairo_t *cr,
 	      double x1, double y1,
 	      double x2, double y2,
 	      double radius);
 */
 
-void
+cairo_public void
 cairo_rel_move_to (cairo_t *cr, double dx, double dy);
 
-void
+cairo_public void
 cairo_rel_line_to (cairo_t *cr, double dx, double dy);
 
-void
+cairo_public void
 cairo_rel_curve_to (cairo_t *cr,
 		    double dx1, double dy1,
 		    double dx2, double dy2,
 		    double dx3, double dy3);
 
-void
+cairo_public void
 cairo_rectangle (cairo_t *cr,
 		 double x, double y,
 		 double width, double height);
 
 /* XXX: NYI
-void
+cairo_public void
 cairo_stroke_to_path (cairo_t *cr);
 */
 
-void
+cairo_public void
 cairo_close_path (cairo_t *cr);
 
 /* Painting functions */
-void
+cairo_public void
 cairo_paint (cairo_t *cr);
 
-void
+cairo_public void
 cairo_paint_with_alpha (cairo_t *cr,
 			double   alpha);
 
-void
+cairo_public void
 cairo_mask (cairo_t         *cr,
 	    cairo_pattern_t *pattern);
 
-void
+cairo_public void
 cairo_mask_surface (cairo_t         *cr,
 		    cairo_surface_t *surface,
 		    double           surface_x,
 		    double           surface_y);
 
-void
+cairo_public void
 cairo_stroke (cairo_t *cr);
 
-void
+cairo_public void
 cairo_stroke_preserve (cairo_t *cr);
 
-void
+cairo_public void
 cairo_fill (cairo_t *cr);
 
-void
+cairo_public void
 cairo_fill_preserve (cairo_t *cr);
 
-void
+cairo_public void
 cairo_copy_page (cairo_t *cr);
 
-void
+cairo_public void
 cairo_show_page (cairo_t *cr);
 
 /* Insideness testing */
-cairo_bool_t
+cairo_public cairo_bool_t
 cairo_in_stroke (cairo_t *cr, double x, double y);
 
-cairo_bool_t
+cairo_public cairo_bool_t
 cairo_in_fill (cairo_t *cr, double x, double y);
 
 /* Rectangular extents */
-void
+cairo_public void
 cairo_stroke_extents (cairo_t *cr,
 		      double *x1, double *y1,
 		      double *x2, double *y2);
 
-void
+cairo_public void
 cairo_fill_extents (cairo_t *cr,
 		    double *x1, double *y1,
 		    double *x2, double *y2);
 
 /* Clipping */
-void
+cairo_public void
 cairo_reset_clip (cairo_t *cr);
 
-void
+cairo_public void
 cairo_clip (cairo_t *cr);
 
-void
+cairo_public void
 cairo_clip_preserve (cairo_t *cr);
 
 /* Font/Text functions */
@@ -777,130 +777,130 @@ typedef enum _cairo_hint_metrics {
 
 typedef struct _cairo_font_options cairo_font_options_t;
 
-cairo_font_options_t *
+cairo_public cairo_font_options_t *
 cairo_font_options_create (void);
 
-cairo_font_options_t *
+cairo_public cairo_font_options_t *
 cairo_font_options_copy (const cairo_font_options_t *original);
 
-void 
+cairo_public void 
 cairo_font_options_destroy (cairo_font_options_t *options);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_font_options_status (cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_font_options_merge (cairo_font_options_t       *options,
 			  const cairo_font_options_t *other);
-cairo_bool_t
+cairo_public cairo_bool_t
 cairo_font_options_equal (const cairo_font_options_t *options,
 			  const cairo_font_options_t *other);
 
-unsigned long
+cairo_public unsigned long
 cairo_font_options_hash (const cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_font_options_set_antialias (cairo_font_options_t *options,
 				  cairo_antialias_t     antialias);
-cairo_antialias_t
+cairo_public cairo_antialias_t
 cairo_font_options_get_antialias (const cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_font_options_set_subpixel_order (cairo_font_options_t   *options,
 				       cairo_subpixel_order_t  subpixel_order);
-cairo_subpixel_order_t
+cairo_public cairo_subpixel_order_t
 cairo_font_options_get_subpixel_order (const cairo_font_options_t *options);
 			 
-void
+cairo_public void
 cairo_font_options_set_hint_style (cairo_font_options_t *options,
 				   cairo_hint_style_t     hint_style);
-cairo_hint_style_t
+cairo_public cairo_hint_style_t
 cairo_font_options_get_hint_style (const cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
 				     cairo_hint_metrics_t  hint_metrics);
-cairo_hint_metrics_t
+cairo_public cairo_hint_metrics_t
 cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
 
 
 /* This interface is for dealing with text as text, not caring about the
    font object inside the the cairo_t. */
 
-void
+cairo_public void
 cairo_select_font_face (cairo_t              *cr, 
 			const char           *family, 
 			cairo_font_slant_t   slant, 
 			cairo_font_weight_t  weight);
 
-void
+cairo_public void
 cairo_set_font_size (cairo_t *cr, double size);
 
-void
+cairo_public void
 cairo_set_font_matrix (cairo_t		    *cr,
 		       const cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_get_font_matrix (cairo_t *cr,
 		       cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_set_font_options (cairo_t                    *cr,
 			const cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_get_font_options (cairo_t              *cr,
 			cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_show_text (cairo_t *cr, const char *utf8);
 
-void
+cairo_public void
 cairo_show_glyphs (cairo_t *cr, cairo_glyph_t *glyphs, int num_glyphs);
 
-cairo_font_face_t *
+cairo_public cairo_font_face_t *
 cairo_get_font_face (cairo_t *cr);
 
-void
+cairo_public void
 cairo_font_extents (cairo_t              *cr, 
 		    cairo_font_extents_t *extents);
 
-void
+cairo_public void
 cairo_set_font_face (cairo_t *cr, cairo_font_face_t *font_face);
 
-void
+cairo_public void
 cairo_text_extents (cairo_t              *cr,
 		    const char    	 *utf8,
 		    cairo_text_extents_t *extents);
 
-void
+cairo_public void
 cairo_glyph_extents (cairo_t               *cr,
 		     cairo_glyph_t         *glyphs, 
 		     int                   num_glyphs,
 		     cairo_text_extents_t  *extents);
 
-void
+cairo_public void
 cairo_text_path  (cairo_t *cr, const char *utf8);
 
-void
+cairo_public void
 cairo_glyph_path (cairo_t *cr, cairo_glyph_t *glyphs, int num_glyphs);
 
 /* Generic identifier for a font style */
 
-cairo_font_face_t *
+cairo_public cairo_font_face_t *
 cairo_font_face_reference (cairo_font_face_t *font_face);
 
-void
+cairo_public void
 cairo_font_face_destroy (cairo_font_face_t *font_face);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_font_face_status (cairo_font_face_t *font_face);
 
-void *
+cairo_public void *
 cairo_font_face_get_user_data (cairo_font_face_t	   *font_face,
 			       const cairo_user_data_key_t *key);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_font_face_set_user_data (cairo_font_face_t	   *font_face,
 			       const cairo_user_data_key_t *key,
 			       void			   *user_data,
@@ -908,26 +908,26 @@ cairo_font_face_set_user_data (cairo_font_face_t	   *font_face,
 
 /* Portable interface to general font features. */
 
-cairo_scaled_font_t *
+cairo_public cairo_scaled_font_t *
 cairo_scaled_font_create (cairo_font_face_t          *font_face,
 			  const cairo_matrix_t       *font_matrix,
 			  const cairo_matrix_t       *ctm,
 			  const cairo_font_options_t *options);
 
-cairo_scaled_font_t *
+cairo_public cairo_scaled_font_t *
 cairo_scaled_font_reference (cairo_scaled_font_t *scaled_font);
 
-void
+cairo_public void
 cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_scaled_font_status (cairo_scaled_font_t *scaled_font);
 
-void
+cairo_public void
 cairo_scaled_font_extents (cairo_scaled_font_t  *scaled_font,
 			   cairo_font_extents_t *extents);
 
-void
+cairo_public void
 cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
 				 cairo_glyph_t         *glyphs, 
 				 int                   num_glyphs,
@@ -935,42 +935,42 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
 
 /* Query functions */
 
-cairo_operator_t
+cairo_public cairo_operator_t
 cairo_get_operator (cairo_t *cr);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_get_source (cairo_t *cr);
 
-double
+cairo_public double
 cairo_get_tolerance (cairo_t *cr);
 
-cairo_antialias_t
+cairo_public cairo_antialias_t
 cairo_get_antialias (cairo_t *cr);
 
-void
+cairo_public void
 cairo_get_current_point (cairo_t *cr, double *x, double *y);
 
-cairo_fill_rule_t
+cairo_public cairo_fill_rule_t
 cairo_get_fill_rule (cairo_t *cr);
 
-double
+cairo_public double
 cairo_get_line_width (cairo_t *cr);
 
-cairo_line_cap_t
+cairo_public cairo_line_cap_t
 cairo_get_line_cap (cairo_t *cr);
 
-cairo_line_join_t
+cairo_public cairo_line_join_t
 cairo_get_line_join (cairo_t *cr);
 
-double
+cairo_public double
 cairo_get_miter_limit (cairo_t *cr);
 
 /* XXX: How to do cairo_get_dash??? Do we want to switch to a cairo_dash object? */
 
-void
+cairo_public void
 cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_get_target (cairo_t *cr);
 
 typedef enum _cairo_path_data_type {
@@ -1075,25 +1075,25 @@ typedef struct cairo_path {
     int num_data;
 } cairo_path_t;
 
-cairo_path_t *
+cairo_public cairo_path_t *
 cairo_copy_path (cairo_t *cr);
 
-cairo_path_t *
+cairo_public cairo_path_t *
 cairo_copy_path_flat (cairo_t *cr);
 
-void
+cairo_public void
 cairo_append_path (cairo_t	*cr,
 		   cairo_path_t *path);
 
-void
+cairo_public void
 cairo_path_destroy (cairo_path_t *path);
 
 /* Error status queries */
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_status (cairo_t *cr);
 
-const char *
+cairo_public const char *
 cairo_status_to_string (cairo_status_t status);
 
 /* Surface manipulation */
@@ -1118,65 +1118,65 @@ typedef enum _cairo_content {
     CAIRO_CONTENT_COLOR_ALPHA	= 0x3000
 } cairo_content_t;
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_surface_create_similar (cairo_surface_t  *other,
 			      cairo_content_t	content,
 			      int		width,
 			      int		height);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_surface_reference (cairo_surface_t *surface);
 
-void
+cairo_public void
 cairo_surface_destroy (cairo_surface_t *surface);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_surface_status (cairo_surface_t *surface);
 
-void
+cairo_public void
 cairo_surface_finish (cairo_surface_t *surface);
 
 #if CAIRO_HAS_PNG_FUNCTIONS
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_surface_write_to_png (cairo_surface_t	*surface,
 			    const char		*filename);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_surface_write_to_png_stream (cairo_surface_t	*surface,
 				   cairo_write_func_t	write_func,
 				   void			*closure);
 
 #endif
 
-void *
+cairo_public void *
 cairo_surface_get_user_data (cairo_surface_t		 *surface,
 			     const cairo_user_data_key_t *key);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_surface_set_user_data (cairo_surface_t		 *surface,
 			     const cairo_user_data_key_t *key,
 			     void			 *user_data,
 			     cairo_destroy_func_t	 destroy);
 
-void
+cairo_public void
 cairo_surface_get_font_options (cairo_surface_t      *surface,
 				cairo_font_options_t *options);
 
-void
+cairo_public void
 cairo_surface_flush (cairo_surface_t *surface);
 
-void
+cairo_public void
 cairo_surface_mark_dirty (cairo_surface_t *surface);
 
-void
+cairo_public void
 cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
 				    int              x,
 				    int              y,
 				    int              width,
 				    int              height);
 
-void
+cairo_public void
 cairo_surface_set_device_offset (cairo_surface_t *surface,
 				 double           x_offset,
 				 double           y_offset);
@@ -1212,30 +1212,30 @@ typedef enum _cairo_format {
     CAIRO_FORMAT_A1
 } cairo_format_t;
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_image_surface_create (cairo_format_t	format,
 			    int			width,
 			    int			height);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_image_surface_create_for_data (unsigned char	       *data,
 				     cairo_format_t		format,
 				     int			width,
 				     int			height,
 				     int			stride);
 
-int
+cairo_public int
 cairo_image_surface_get_width (cairo_surface_t *surface);
 
-int
+cairo_public int
 cairo_image_surface_get_height (cairo_surface_t *surface);
 
 #if CAIRO_HAS_PNG_FUNCTIONS
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_image_surface_create_from_png (const char	*filename);
 
-cairo_surface_t *
+cairo_public cairo_surface_t *
 cairo_image_surface_create_from_png_stream (cairo_read_func_t	read_func,
 					    void		*closure);
 
@@ -1243,49 +1243,49 @@ cairo_image_surface_create_from_png_stream (cairo_read_func_t	read_func,
 
 /* Pattern creation functions */
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_create_rgb (double red, double green, double blue);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_create_rgba (double red, double green, double blue,
 			   double alpha);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_create_for_surface (cairo_surface_t *surface);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_create_linear (double x0, double y0,
 			     double x1, double y1);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_create_radial (double cx0, double cy0, double radius0,
 			     double cx1, double cy1, double radius1);
 
-cairo_pattern_t *
+cairo_public cairo_pattern_t *
 cairo_pattern_reference (cairo_pattern_t *pattern);
 
-void
+cairo_public void
 cairo_pattern_destroy (cairo_pattern_t *pattern);
   
-cairo_status_t
+cairo_public cairo_status_t
 cairo_pattern_status (cairo_pattern_t *pattern);
 
-void
+cairo_public void
 cairo_pattern_add_color_stop_rgb (cairo_pattern_t *pattern,
 				  double offset,
 				  double red, double green, double blue);
 
-void
+cairo_public void
 cairo_pattern_add_color_stop_rgba (cairo_pattern_t *pattern,
 				   double offset,
 				   double red, double green, double blue,
 				   double alpha);
 
-void
+cairo_public void
 cairo_pattern_set_matrix (cairo_pattern_t      *pattern,
 			  const cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_pattern_get_matrix (cairo_pattern_t *pattern,
 			  cairo_matrix_t  *matrix);
 
@@ -1295,10 +1295,10 @@ typedef enum _cairo_extend {
     CAIRO_EXTEND_REFLECT
 } cairo_extend_t;
 
-void
+cairo_public void
 cairo_pattern_set_extend (cairo_pattern_t *pattern, cairo_extend_t extend);
 
-cairo_extend_t
+cairo_public cairo_extend_t
 cairo_pattern_get_extend (cairo_pattern_t *pattern);
 
 typedef enum _cairo_filter {
@@ -1310,59 +1310,59 @@ typedef enum _cairo_filter {
     CAIRO_FILTER_GAUSSIAN
 } cairo_filter_t;
   
-void
+cairo_public void
 cairo_pattern_set_filter (cairo_pattern_t *pattern, cairo_filter_t filter);
 
-cairo_filter_t
+cairo_public cairo_filter_t
 cairo_pattern_get_filter (cairo_pattern_t *pattern);
 
 /* Matrix functions */
 
-void
+cairo_public void
 cairo_matrix_init (cairo_matrix_t *matrix,
 		   double  xx, double  yx,
 		   double  xy, double  yy,
 		   double  x0, double  y0);
 
-void
+cairo_public void
 cairo_matrix_init_identity (cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_matrix_init_translate (cairo_matrix_t *matrix,
 			     double tx, double ty);
 
-void
+cairo_public void
 cairo_matrix_init_scale (cairo_matrix_t *matrix,
 			 double sx, double sy);
 
-void
+cairo_public void
 cairo_matrix_init_rotate (cairo_matrix_t *matrix,
 			  double radians);
 
-void
+cairo_public void
 cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty);
 
-void
+cairo_public void
 cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy);
 
-void
+cairo_public void
 cairo_matrix_rotate (cairo_matrix_t *matrix, double radians);
 
-cairo_status_t
+cairo_public cairo_status_t
 cairo_matrix_invert (cairo_matrix_t *matrix);
 
-void
+cairo_public void
 cairo_matrix_multiply (cairo_matrix_t	    *result,
 		       const cairo_matrix_t *a,
 		       const cairo_matrix_t *b);
 
 /* XXX: Need a new name here perhaps. */
-void
+cairo_public void
 cairo_matrix_transform_distance (const cairo_matrix_t *matrix,
 				 double *dx, double *dy);
 
 /* XXX: Need a new name here perhaps. */
-void
+cairo_public void
 cairo_matrix_transform_point (const cairo_matrix_t *matrix,
 			      double *x, double *y);