isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-09 11:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter-actor: Rename y1 to y_1 to avoid a compiler warning

Browse Source 
Somebody somewhere decided it would be ok to define 'y1' as a global
function in math.h thus condemning us to repeatedly making commits to
fix these obnoxious compiler warnings about aliasing.
This commit is contained in:
Neil Roberts 2010-03-24 15:32:28 +00:00
parent 5de85051c3
commit 6a8e108757
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-actor.c
View File

@ -8310,16 +8310,16 @@ clutter_geometry_union (const ClutterGeometry *geometry_a,
{ {
/* We don't try to handle rectangles that can't be represented /* We don't try to handle rectangles that can't be represented
* as a signed integer box */ * as a signed integer box */
gint x1 = MIN (geometry_a->x, geometry_b->x); gint x_1 = MIN (geometry_a->x, geometry_b->x);
gint y1 = MIN (geometry_a->y, geometry_b->y); gint y_1 = MIN (geometry_a->y, geometry_b->y);
gint x2 = MAX (geometry_a->x + (gint)geometry_a->width, gint x_2 = MAX (geometry_a->x + (gint)geometry_a->width,
geometry_b->x + (gint)geometry_b->width); geometry_b->x + (gint)geometry_b->width);
gint y2 = MAX (geometry_a->y + (gint)geometry_a->height, gint y_2 = MAX (geometry_a->y + (gint)geometry_a->height,
geometry_b->y + (gint)geometry_b->height); geometry_b->y + (gint)geometry_b->height);
result->x = x1; result->x = x_1;
result->y = y1; result->y = y_1;
result->width = x2 - x1; result->width = x_2 - x_1;
result->height = y2 - y1; result->height = y_2 - y_1;
} }
/* /*