From fffdeb64c72a853604586a19e894ab0fef03b50e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 7 Aug 2007 14:12:58 +0000 Subject: [PATCH] Do not mask the y1 symbol exported by math.h Do you ever wonder what would happen if glibc were a serious library and not the joke it actually is? --- clutter/clutter-fixed.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter-fixed.c b/clutter/clutter-fixed.c index d6d39e1d8..98e243d07 100644 --- a/clutter/clutter-fixed.c +++ b/clutter/clutter-fixed.c @@ -626,7 +626,7 @@ clutter_sqrti (gint number) * elsewhere in clutter is not good enough, and 10.22 is used instead. */ ClutterFixed x; - unsigned long y1; /* 10.22 fixed point */ + unsigned long y_1; /* 10.22 fixed point */ unsigned long f = 0x600000; /* '1.5' as 10.22 fixed */ union @@ -658,11 +658,11 @@ clutter_sqrti (gint number) flt2.i &= 0x7FFFFF; /* Now we correct the estimate, only single iterration is needed */ - y1 = (flt2.i >> 11) * (flt2.i >> 11); - y1 = (y1 >> 8) * (x >> 8); + y_1 = (flt2.i >> 11) * (flt2.i >> 11); + y_1 = (y_1 >> 8) * (x >> 8); - y1 = f - y1; - flt2.i = (flt2.i >> 11) * (y1 >> 11); + y_1 = f - y_1; + flt2.i = (flt2.i >> 11) * (y_1 >> 11); /* Invert, round and convert from 10.22 to an integer * 0x1e3c68 is a magical rounding constant that produces slightly