diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2008-12-19 18:21:36 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2008-12-19 18:21:36 +0000 |
| commit | 4e493d1937e6e68e394dcb8a0ae7671dcc6d39e1 (patch) | |
| tree | 22c3e95d62680fa9c0f30546948671e8223672e5 /clutter/clutter-path.h | |
| parent | 42bba13135d97babd5c0a0ce3b65836d077fbd5a (diff) | |
| download | clutter-4e493d1937e6e68e394dcb8a0ae7671dcc6d39e1.tar.gz | |
Avoid masking math.h exported variables
Our beloved math.h exports, from bits/mathcalls.h, a bare "y1" symbol.
Apparently, it's unthinkable for code including <math.h> to also declare
arguments or variable named "y0", "y1" and "yn".
Anyway, the quick fix already used elsewhere in Clutter's codebase is
to rename the colliding variables "y_0", "y_1" and "y_n" - and
obviously everything similar to them as well, using the same pattern.
Diffstat (limited to 'clutter/clutter-path.h')
| -rw-r--r-- | clutter/clutter-path.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/clutter/clutter-path.h b/clutter/clutter-path.h index cf380b8eb..105c4b306 100644 --- a/clutter/clutter-path.h +++ b/clutter/clutter-path.h @@ -161,19 +161,19 @@ void clutter_path_add_rel_line_to (ClutterPath *path, gint x, gint y); void clutter_path_add_curve_to (ClutterPath *path, - gint x1, - gint y1, - gint x2, - gint y2, - gint x3, - gint y3); + gint x_1, + gint y_1, + gint x_2, + gint y_2, + gint x_3, + gint y_3); void clutter_path_add_rel_curve_to (ClutterPath *path, - gint x1, - gint y1, - gint x2, - gint y2, - gint x3, - gint y3); + gint x_1, + gint y_1, + gint x_2, + gint y_2, + gint x_3, + gint y_3); void clutter_path_add_close (ClutterPath *path); gboolean clutter_path_add_string (ClutterPath *path, const gchar *str); |