--- cairo-1.0.0.orig/src/cairo-pattern.c	2005-08-24 07:42:19.000000000 +0200
+++ cairo-1.0.0/src/cairo-pattern.c	2005-09-07 10:21:56.000000000 +0200
@@ -422,13 +422,13 @@ cairo_pattern_create_for_surface (cairo_
 
 /**
  * cairo_pattern_create_linear:
- * @x0: x coordinate of the start point 
- * @y0: y coordinate of the start point 
- * @x1: x coordinate of the end point 
- * @y1: y coordinate of the end point 
+ * @x0_: x coordinate of the start point 
+ * @y0_: y coordinate of the start point 
+ * @x1_: x coordinate of the end point 
+ * @y1_: y coordinate of the end point 
  * 
  * Create a new linear gradient cairo_pattern_t along the line defined
- * by (x0, y0) and (x1, y1).  Before using the gradient pattern, a
+ * by (x0_, y0_) and (x1_, y1_).  Before using the gradient pattern, a
  * number of color stops should be defined using
  * cairo_pattern_add_color_stop_rgb() or
  * cairo_pattern_add_color_stop_rgba().
--- cairo-1.0.0.orig/src/cairo-matrix.c	2005-08-23 16:39:24.000000000 +0200
+++ cairo-1.0.0/src/cairo-matrix.c	2005-09-07 10:22:57.000000000 +0200
@@ -68,15 +68,15 @@ slim_hidden_def(cairo_matrix_init_identi
  * @yx: yx component of the affine transformation
  * @xy: xy component of the affine transformation
  * @yy: yy component of the affine transformation
- * @x0: X translation component of the affine transformation
- * @y0: Y translation component of the affine transformation
+ * @x0_: X translation component of the affine transformation
+ * @y0_: Y translation component of the affine transformation
  * 
  * Sets @matrix to be the affine transformation given by
- * @xx, @yx, @xy, @yy, @x0, @y0. The transformation is given
+ * @xx, @yx, @xy, @yy, @x0_, @y0_. The transformation is given
  * by:
  * <programlisting>
- *  x_new = xx * x + xy * y + x0;
- *  y_new = yx * x + yy * y + y0;
+ *  x_new = xx * x + xy * y + x0_;
+ *  y_new = yx * x + yy * y + y0_;
  * </programlisting>
  **/
 void
--- cairo-1.0.0.orig/src/cairo.h	2005-08-24 09:21:44.000000000 +0200
+++ cairo-1.0.0/src/cairo.h	2005-09-07 10:32:43.000000000 +0200
@@ -440,7 +440,7 @@ cairo_line_to (cairo_t *cr, double x, do
 
 void
 cairo_curve_to (cairo_t *cr,
-		double x1, double y1,
+		double x1, double y1_,
 		double x2, double y2,
 		double x3, double y3);
 
@@ -535,12 +535,12 @@ cairo_in_fill (cairo_t *cr, double x, do
 /* Rectangular extents */
 void
 cairo_stroke_extents (cairo_t *cr,
-		      double *x1, double *y1,
+		      double *x1, double *y1_,
 		      double *x2, double *y2);
 
 void
 cairo_fill_extents (cairo_t *cr,
-		    double *x1, double *y1,
+		    double *x1, double *y1_,
 		    double *x2, double *y2);
 
 /* Clipping */
@@ -1254,8 +1254,8 @@ cairo_pattern_t *
 cairo_pattern_create_for_surface (cairo_surface_t *surface);
 
 cairo_pattern_t *
-cairo_pattern_create_linear (double x0, double y0,
-			     double x1, double y1);
+cairo_pattern_create_linear (double x0_, double y0_,
+			     double x1_, double y1_);
 
 cairo_pattern_t *
 cairo_pattern_create_radial (double cx0, double cy0, double radius0,
@@ -1322,7 +1322,7 @@ void
 cairo_matrix_init (cairo_matrix_t *matrix,
 		   double  xx, double  yx,
 		   double  xy, double  yy,
-		   double  x0, double  y0);
+		   double  x0_, double  y0_);
 
 void
 cairo_matrix_init_identity (cairo_matrix_t *matrix);
--- cairo-1.0.0.orig/src/cairo.c	2005-08-24 15:15:43.000000000 +0200
+++ cairo-1.0.0/src/cairo.c	2005-09-07 10:33:00.000000000 +0200
@@ -1028,14 +1028,14 @@ cairo_line_to (cairo_t *cr, double x, do
  * cairo_curve_to:
  * @cr: a cairo context
  * @x1: the X coordinate of the first control point
- * @y1: the Y coordinate of the first control point
+ * @y1_: the Y coordinate of the first control point
  * @x2: the X coordinate of the second control point
  * @y2: the Y coordinate of the second control point
  * @x3: the X coordinate of the end of the curve
  * @y3: the Y coordinate of the end of the curve
  *
  * Adds a cubic Bézier spline to the path from the current point to
- * position (@x3, @y3) in user-space coordinates, using (@x1, @y1) and
+ * position (@x3, @y3) in user-space coordinates, using (@x1, @y1_) and
  * (@x2, @y2) as the control points. After this call the current point
  * will be (@x3, @y3).
  **/