X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-trunc1.c;h=b9e8a3c88a539febd729017db76940d408cc00ad;hb=cfa381fc27ccee5fefcab6be96596f63d84d1fa5;hp=a2d6dd4b4a86fc1ed2bc6f4a343cddb871dc33ea;hpb=b17d7ac7df62c7c7f56fe857ed28151d8b0e4e28;p=gnulib.git

diff --git a/tests/test-trunc1.c b/tests/test-trunc1.c
index a2d6dd4b4..b9e8a3c88 100644
--- a/tests/test-trunc1.c
+++ b/tests/test-trunc1.c
@@ -23,7 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "isnand.h"
+#include "isnand-nolibm.h"
+#include "nan.h"
 
 #define ASSERT(expr) \
   do									     \
@@ -31,29 +32,22 @@
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           abort ();							     \
         }								     \
     }									     \
   while (0)
 
-/* The Compaq (ex-DEC) C 6.4 compiler chokes on the expression 0.0 / 0.0.  */
-#ifdef __DECC
-static double
-NaN ()
-{
-  static double zero = 0.0;
-  return zero / zero;
-}
-#else
-# define NaN() (0.0 / 0.0)
-#endif
+/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
+   So we use -zero instead.  */
+double zero = 0.0;
 
 int
 main ()
 {
   /* Zero.  */
   ASSERT (trunc (0.0) == 0.0);
-  ASSERT (trunc (-0.0) == 0.0);
+  ASSERT (trunc (-zero) == 0.0);
   /* Positive numbers.  */
   ASSERT (trunc (0.3) == 0.0);
   ASSERT (trunc (0.7) == 0.0);
@@ -78,7 +72,7 @@ main ()
   ASSERT (trunc (1.0 / 0.0) == 1.0 / 0.0);
   ASSERT (trunc (-1.0 / 0.0) == -1.0 / 0.0);
   /* NaNs.  */
-  ASSERT (isnand (trunc (NaN ())));
+  ASSERT (isnand (trunc (NaNd ())));
 
   return 0;
 }