Backout rev 1.2 (workaround for gcc 2.60 expression evaluation

bug) as later versions of gcc have apparently this bug fixed.

1 files changed, 1 insertions, 5 deletions

diff --git a/contrib/groff/libgroff/font.cc b/contrib/groff/libgroff/font.cc
index 7e75c7b58301..d0254e405f67 100644
--- a/contrib/groff/libgroff/font.cc
+++ b/contrib/groff/libgroff/font.cc
@@ -197,11 +197,7 @@ static int scale_round(int n, int x, int y)
   }
   else {
     if (-(unsigned)n <= (-(unsigned)INT_MIN - y2)/x)
-      {
-        // XXX simplify expression to work around bug in gcc-2.6.0
-        int tmp = n*x - y2;
-        return tmp/y;
-      }
+      return (n*x - y2)/y;
     return int(n*double(x)/double(y) - .5);
   }
 }