applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gvc-level-bar: fix shadow global declaration warnings

Browse source 
Those variables are already defined in some headers (like bits/math-finite.h)
making gcc unhappy.

https://bugzilla.gnome.org/show_bug.cgi?id=666240
This commit is contained in:
Guillaume Desmottes 2011-12-15 12:16:37 +01:00 • committed by Bastien Nocera
parent 5568917080
commit d0db3c96e2
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
panels/sound/gvc-level-bar.c
View file

@ -518,17 +518,17 @@ gvc_level_bar_size_allocate (GtkWidget *widget,
static void static void
curved_rectangle (cairo_t *cr, curved_rectangle (cairo_t *cr,
double x0, double _x0,
double y0, double _y0,
double width, double width,
double height, double height,
double radius) double radius)
{ {
double x1; double x1;
double y1; double _y1;
x1 = x0 + width; x1 = _x0 + width;
y1 = y0 + height; _y1 = _y0 + height;
if (!width || !height) { if (!width || !height) {
return; return;
@ -536,37 +536,37 @@ curved_rectangle (cairo_t *cr,
if (width / 2 < radius) { if (width / 2 < radius) {
if (height / 2 < radius) { if (height / 2 < radius) {
cairo_move_to (cr, x0, (y0 + y1) / 2); cairo_move_to (cr, _x0, (_y0 + _y1) / 2);
cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1) / 2, y0); cairo_curve_to (cr, _x0 ,_y0, _x0, _y0, (_x0 + x1) / 2, _y0);
cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2); cairo_curve_to (cr, x1, _y0, x1, _y0, x1, (_y0 + _y1) / 2);
cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1); cairo_curve_to (cr, x1, _y1, x1, _y1, (x1 + _x0) / 2, _y1);
cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2); cairo_curve_to (cr, _x0, _y1, _x0, _y1, _x0, (_y0 + _y1) / 2);
} else { } else {
cairo_move_to (cr, x0, y0 + radius); cairo_move_to (cr, _x0, _y0 + radius);
cairo_curve_to (cr, x0, y0, x0, y0, (x0 + x1) / 2, y0); cairo_curve_to (cr, _x0, _y0, _x0, _y0, (_x0 + x1) / 2, _y0);
cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); cairo_curve_to (cr, x1, _y0, x1, _y0, x1, _y0 + radius);
cairo_line_to (cr, x1, y1 - radius); cairo_line_to (cr, x1, _y1 - radius);
cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0) / 2, y1); cairo_curve_to (cr, x1, _y1, x1, _y1, (x1 + _x0) / 2, _y1);
cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius); cairo_curve_to (cr, _x0, _y1, _x0, _y1, _x0, _y1 - radius);
} }
} else { } else {
if (height / 2 < radius) { if (height / 2 < radius) {
cairo_move_to (cr, x0, (y0 + y1) / 2); cairo_move_to (cr, _x0, (_y0 + _y1) / 2);
cairo_curve_to (cr, x0, y0, x0 , y0, x0 + radius, y0); cairo_curve_to (cr, _x0, _y0, _x0 , _y0, _x0 + radius, _y0);
cairo_line_to (cr, x1 - radius, y0); cairo_line_to (cr, x1 - radius, _y0);
cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1) / 2); cairo_curve_to (cr, x1, _y0, x1, _y0, x1, (_y0 + _y1) / 2);
cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); cairo_curve_to (cr, x1, _y1, x1, _y1, x1 - radius, _y1);
cairo_line_to (cr, x0 + radius, y1); cairo_line_to (cr, _x0 + radius, _y1);
cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1) / 2); cairo_curve_to (cr, _x0, _y1, _x0, _y1, _x0, (_y0 + _y1) / 2);
} else { } else {
cairo_move_to (cr, x0, y0 + radius); cairo_move_to (cr, _x0, _y0 + radius);
cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0); cairo_curve_to (cr, _x0 , _y0, _x0 , _y0, _x0 + radius, _y0);
cairo_line_to (cr, x1 - radius, y0); cairo_line_to (cr, x1 - radius, _y0);
cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius); cairo_curve_to (cr, x1, _y0, x1, _y0, x1, _y0 + radius);
cairo_line_to (cr, x1, y1 - radius); cairo_line_to (cr, x1, _y1 - radius);
cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1); cairo_curve_to (cr, x1, _y1, x1, _y1, x1 - radius, _y1);
cairo_line_to (cr, x0 + radius, y1); cairo_line_to (cr, _x0 + radius, _y1);
cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - radius); cairo_curve_to (cr, _x0, _y1, _x0, _y1, _x0, _y1 - radius);
} }
} }