diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
| commit | 0db2497936950725ae71e997091ef276a3ec43ee (patch) | |
| tree | 7d66db137accea00fe402dfabf8e5de3a4af58c6 /stdio-common | |
| parent | b9ea6c38033d6ab0bda9dddb34cc7a4c6ff82084 (diff) | |
| download | glibc-0db2497936950725ae71e997091ef276a3ec43ee.tar.gz | |
Updated to fedora-glibc-20060102T1045
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/tst-fgets.c | 2 | ||||
| -rw-r--r-- | stdio-common/tstdiomisc.c | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/stdio-common/tst-fgets.c b/stdio-common/tst-fgets.c index b8e205c7dc..0aa9030e3a 100644 --- a/stdio-common/tst-fgets.c +++ b/stdio-common/tst-fgets.c @@ -5,7 +5,7 @@ static int do_test (void) { - FILE *fp = fmemopen ("hello", 5, "r"); + FILE *fp = fmemopen ((char *) "hello", 5, "r"); char buf[2]; char *bp = fgets (buf, sizeof (buf), fp); printf ("fgets: %s\n", bp == buf ? "OK" : "ERROR"); diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c index 452a21f9cb..e89487cb45 100644 --- a/stdio-common/tstdiomisc.c +++ b/stdio-common/tstdiomisc.c @@ -46,6 +46,16 @@ 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 + static int F (void) { @@ -53,8 +63,9 @@ F (void) wchar_t wbuf[10]; int result; - snprintf (buf, sizeof buf, "%f %F", DBL_MAX * DBL_MAX - DBL_MAX * DBL_MAX, - DBL_MAX * DBL_MAX - DBL_MAX * DBL_MAX); + snprintf (buf, sizeof buf, FLT_FLT_FMT, + dbl_max * dbl_max - dbl_max * dbl_max, + dbl_max * dbl_max - dbl_max * dbl_max); result = strcmp (buf, "nan NAN") != 0; printf ("expected \"nan NAN\", got \"%s\"\n", buf); @@ -62,9 +73,9 @@ F (void) result |= strcmp (buf, "inf INF") != 0; printf ("expected \"inf INF\", got \"%s\"\n", buf); - swprintf (wbuf, sizeof wbuf / sizeof (wbuf[0]), L"%f %F", - DBL_MAX * DBL_MAX - DBL_MAX * DBL_MAX, - DBL_MAX * DBL_MAX - DBL_MAX * DBL_MAX); + 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); result |= wcscmp (wbuf, L"nan NAN") != 0; printf ("expected L\"nan NAN\", got L\"%S\"\n", wbuf); |