summaryrefslogtreecommitdiff
path: root/stdio-common/tstdiomisc.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-01-09 21:55:11 +0000
committerJakub Jelinek <jakub@redhat.com>2006-01-09 21:55:11 +0000
commit06f313e361a523605ba6d4c9cdc67a7353cd367c (patch)
tree007c600599bb65c7a685423c611977f6e4eb26e6 /stdio-common/tstdiomisc.c
parentbd09caaa27e6c4613afc4a91a70f09babca1aef2 (diff)
Updated to fedora-glibc-20060109T2152cvs/fedora-glibc-2_3_90-30
Diffstat (limited to 'stdio-common/tstdiomisc.c')
-rw-r--r--stdio-common/tstdiomisc.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c
index e89487cb45..db038fa2b0 100644
--- a/stdio-common/tstdiomisc.c
+++ b/stdio-common/tstdiomisc.c
@@ -46,15 +46,8 @@ t2 (void)
return result;
}
-#if FLT_EVAL_METHOD == 2
-volatile long double dbl_max = LDBL_MAX;
-# define FLT_FLT_FMT "%Lf %LF"
-# define FLT_FLT_WFMT L"%Lf %LF"
-#else
-# define dbl_max DBL_MAX
-# define FLT_FLT_FMT "%f %F"
-# define FLT_FLT_WFMT L"%f %F"
-#endif
+volatile double nanval;
+
static int
F (void)
@@ -63,9 +56,9 @@ F (void)
wchar_t wbuf[10];
int result;
- snprintf (buf, sizeof buf, FLT_FLT_FMT,
- dbl_max * dbl_max - dbl_max * dbl_max,
- dbl_max * dbl_max - dbl_max * dbl_max);
+ nanval = NAN;
+
+ snprintf (buf, sizeof buf, "%f %F", nanval, nanval);
result = strcmp (buf, "nan NAN") != 0;
printf ("expected \"nan NAN\", got \"%s\"\n", buf);
@@ -73,9 +66,7 @@ F (void)
result |= strcmp (buf, "inf INF") != 0;
printf ("expected \"inf INF\", got \"%s\"\n", buf);
- swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), FLT_FLT_WFMT,
- dbl_max * dbl_max - dbl_max * dbl_max,
- dbl_max * dbl_max - dbl_max * dbl_max);
+ swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%f %F", nanval, nanval);
result |= wcscmp (wbuf, L"nan NAN") != 0;
printf ("expected L\"nan NAN\", got L\"%S\"\n", wbuf);