diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pango-renderer.c | 6 | ||||
| -rw-r--r-- | pango/pango-renderer.h | 4 |
4 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Jan 4 14:05:13 2005 Owen Taylor <otaylor@redhat.com> + + * pango/pango-renderer.c (pango_renderer_draw_trapezoid): Rename + y1 parameters to y1_ to avoid conflicts with the math.h Bessel + function. (#161969) + Fri Dec 31 10:20:55 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_pango): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2d6fa0f6..284990e0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Tue Jan 4 14:05:13 2005 Owen Taylor <otaylor@redhat.com> + + * pango/pango-renderer.c (pango_renderer_draw_trapezoid): Rename + y1 parameters to y1_ to avoid conflicts with the math.h Bessel + function. (#161969) + Fri Dec 31 10:20:55 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_pango): diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 04d5b761..6a4ba3c6 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -910,7 +910,7 @@ pango_renderer_default_draw_error_underline (PangoRenderer *renderer, * pango_renderer_draw_trapezoid: * @renderer: a #PangoRenderer * @part: type of object this trapezoid is part of - * @y1: Y coordinate of top of trapezoid + * @y1_: Y coordinate of top of trapezoid * @x11: X coordinate of left end of top of trapezoid * @x21: X coordinate of right end of top of trapezoid * @y2: X coordinate of top of trapezoid @@ -925,7 +925,7 @@ pango_renderer_default_draw_error_underline (PangoRenderer *renderer, void pango_renderer_draw_trapezoid (PangoRenderer *renderer, PangoRenderPart part, - double y1, + double y1_, double x11, double x21, double y2, @@ -936,7 +936,7 @@ pango_renderer_draw_trapezoid (PangoRenderer *renderer, g_return_if_fail (renderer->active_count > 0); PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part, - y1, x11, x21, + y1_, x11, x21, y2, x12, x22); } diff --git a/pango/pango-renderer.h b/pango/pango-renderer.h index eace2967..4a993969 100644 --- a/pango/pango-renderer.h +++ b/pango/pango-renderer.h @@ -145,7 +145,7 @@ struct _PangoRendererClass */ void (*draw_trapezoid) (PangoRenderer *renderer, PangoRenderPart part, - double y1, + double y1_, double x11, double x21, double y2, @@ -209,7 +209,7 @@ void pango_renderer_draw_error_underline (PangoRenderer *renderer, int height); void pango_renderer_draw_trapezoid (PangoRenderer *renderer, PangoRenderPart part, - double y1, + double y1_, double x11, double x21, double y2, |