* build-aux/config.guess: Update from config.

[gnulib.git] / lib / frexp.c

diff --git a/lib/frexp.c b/lib/frexp.c
index 3074f2e..251a932 100644 (file)
--- a/lib/frexp.c
+++ b/lib/frexp.c
@@ -20,39 +20,45 @@
 
 #include <config.h>
 
-#if !(defined USE_LONG_DOUBLE && !HAVE_LONG_DOUBLE)
-
 /* Specification.  */
-# include <math.h>
+#include <math.h>
 
-# include <float.h>
-# ifdef USE_LONG_DOUBLE
-#  include "isnanl-nolibm.h"
-# else
-#  include "isnan.h"
-# endif
+#include <float.h>
+#ifdef USE_LONG_DOUBLE
+# include "isnanl-nolibm.h"
+# include "fpucw.h"
+#else
+# include "isnan.h"
+#endif
 
 /* This file assumes FLT_RADIX = 2.  If FLT_RADIX is a power of 2 greater
    than 2, or not even a power of 2, some rounding errors can occur, so that
    then the returned mantissa is only guaranteed to be <= 1.0, not < 1.0.  */
 
-# ifdef USE_LONG_DOUBLE
-#  define FUNC frexpl
-#  define DOUBLE long double
-#  define ISNAN isnanl
-#  define L_(literal) literal##L
-# else
-#  define FUNC frexp
-#  define DOUBLE double
-#  define ISNAN isnan
-#  define L_(literal) literal
-# endif
+#ifdef USE_LONG_DOUBLE
+# define FUNC frexpl
+# define DOUBLE long double
+# define ISNAN isnanl
+# define DECL_ROUNDING DECL_LONG_DOUBLE_ROUNDING
+# define BEGIN_ROUNDING() BEGIN_LONG_DOUBLE_ROUNDING ()
+# define END_ROUNDING() END_LONG_DOUBLE_ROUNDING ()
+# define L_(literal) literal##L
+#else
+# define FUNC frexp
+# define DOUBLE double
+# define ISNAN isnan
+# define DECL_ROUNDING
+# define BEGIN_ROUNDING()
+# define END_ROUNDING()
+# define L_(literal) literal
+#endif
 
 DOUBLE
 FUNC (DOUBLE x, int *exp)
 {
   int sign;
   int exponent;
+  DECL_ROUNDING
 
   /* Test for NaN, infinity, and zero.  */
   if (ISNAN (x) || x + x == x)
@@ -68,6 +74,8 @@ FUNC (DOUBLE x, int *exp)
       sign = -1;
     }
 
+  BEGIN_ROUNDING ();
+
   {
     /* Since the exponent is an 'int', it fits in 64 bits.  Therefore the
        loops are executed no more than 64 times.  */
@@ -149,14 +157,11 @@ FUNC (DOUBLE x, int *exp)
     /* Here 0.5 <= x < 1.0.  */
   }
 
-  *exp = exponent;
-  return (sign < 0 ? - x : x);
-}
-
-#else
+  if (sign < 0)
+    x = - x;
 
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
+  END_ROUNDING ();
 
-#endif
+  *exp = exponent;
+  return x;
+}