X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fceil.c;h=866804b18b2a99c691bf3b8c6ab8ed570045960e;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=ced224ca822ade33743be995f79451d63204e58a;hpb=b064d497f3f612ba40acccbe3dcaccec7980ee39;p=gnulib.git
diff --git a/lib/ceil.c b/lib/ceil.c
index ced224ca8..866804b18 100644
--- a/lib/ceil.c
+++ b/lib/ceil.c
@@ -1,19 +1,18 @@
/* Round towards positive infinity.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
/* Written by Bruno Haible , 2007. */
@@ -42,7 +41,7 @@
#endif
/* 2^(MANT_DIG-1). */
-static const double TWO_MANT_DIG =
+static const DOUBLE TWO_MANT_DIG =
/* Assume MANT_DIG <= 5 * 31.
Use the identity
n = floor(n/5) + floor((n+1)/5) + ... + floor((n+4)/5). */
@@ -64,20 +63,31 @@ FUNC (DOUBLE x)
volatile DOUBLE y = x;
volatile DOUBLE z = y;
- /* Round to the next integer (nearest or up or down, doesn't matter). */
if (z > L_(0.0))
{
- z += TWO_MANT_DIG;
- z -= TWO_MANT_DIG;
+ /* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1. */
+ if (z < TWO_MANT_DIG)
+ {
+ /* Round to the next integer (nearest or up or down, doesn't matter). */
+ z += TWO_MANT_DIG;
+ z -= TWO_MANT_DIG;
+ /* Enforce rounding up. */
+ if (z < y)
+ z += L_(1.0);
+ }
}
else if (z < L_(0.0))
{
- z -= TWO_MANT_DIG;
- z += TWO_MANT_DIG;
+ /* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1. */
+ if (z > - TWO_MANT_DIG)
+ {
+ /* Round to the next integer (nearest or up or down, doesn't matter). */
+ z -= TWO_MANT_DIG;
+ z += TWO_MANT_DIG;
+ /* Enforce rounding up. */
+ if (z < y)
+ z += L_(1.0);
+ }
}
- /* Enforce rounding up. */
- if (z < y)
- z += L_(1.0);
-
return z;
}