diff options
| author | Keith Packard <keithp@keithp.com> | 2018-08-27 21:32:28 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2018-08-29 16:57:27 +0300 |
| commit | 2c245028afa4883163c6ad7d04da9f7b7745b3b4 (patch) | |
| tree | 965ef2364fdbe9760d11d03393b010fbeb9a1e00 /newlib | |
| parent | 9e032fd939a188b38ab36b6e94c93056ed347952 (diff) | |
Use nanf("") instead of nanf(NULL)
Newer GCC versions require a non-NULL argument to this function for
some reason.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/libc/stdio/nano-vfscanf_float.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdio/vfscanf.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdio/vfwscanf.c | 2 | ||||
| -rw-r--r-- | newlib/libc/stdlib/strtod.c | 4 | ||||
| -rw-r--r-- | newlib/libc/stdlib/wcstod.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/newlib/libc/stdio/nano-vfscanf_float.c b/newlib/libc/stdio/nano-vfscanf_float.c index a81fe7f70..5df9f227c 100644 --- a/newlib/libc/stdio/nano-vfscanf_float.c +++ b/newlib/libc/stdio/nano-vfscanf_float.c @@ -330,7 +330,7 @@ fskip: { flp = GET_ARG (N, *ap, float *); if (isnan (fp)) - *flp = nanf (NULL); + *flp = nanf (""); else *flp = fp; } diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index 080dcf400..9c38eebf4 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -1886,7 +1886,7 @@ __SVFSCANF_R (struct _reent *rptr, { flp = GET_ARG (N, ap, float *); if (isnan (res)) - *flp = nanf (NULL); + *flp = nanf (""); else *flp = res; } diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c index c3470a15c..0464b0837 100644 --- a/newlib/libc/stdio/vfwscanf.c +++ b/newlib/libc/stdio/vfwscanf.c @@ -1636,7 +1636,7 @@ __SVFWSCANF_R (struct _reent *rptr, { flp = GET_ARG (N, ap, float *); if (isnan (res)) - *flp = nanf (NULL); + *flp = nanf (""); else *flp = res; } diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c index 431d3ab07..2a76b10ce 100644 --- a/newlib/libc/stdlib/strtod.c +++ b/newlib/libc/stdlib/strtod.c @@ -1289,7 +1289,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc) { double val = _strtod_l (_REENT, s00, se, loc); if (isnan (val)) - return signbit (val) ? -nanf (NULL) : nanf (NULL); + return signbit (val) ? -nanf ("") : nanf (""); float retval = (float) val; #ifndef NO_ERRNO if (isinf (retval) && !isinf (val)) @@ -1304,7 +1304,7 @@ strtof (const char *__restrict s00, { double val = _strtod_l (_REENT, s00, se, __get_current_locale ()); if (isnan (val)) - return signbit (val) ? -nanf (NULL) : nanf (NULL); + return signbit (val) ? -nanf ("") : nanf (""); float retval = (float) val; #ifndef NO_ERRNO if (isinf (retval) && !isinf (val)) diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c index 9e0d563ef..810c5b3fd 100644 --- a/newlib/libc/stdlib/wcstod.c +++ b/newlib/libc/stdlib/wcstod.c @@ -228,7 +228,7 @@ _wcstof_r (struct _reent *ptr, { double retval = _wcstod_l (ptr, nptr, endptr, __get_current_locale ()); if (isnan (retval)) - return nanf (NULL); + return nanf (""); return (float)retval; } @@ -253,7 +253,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr, { double val = _wcstod_l (_REENT, nptr, endptr, loc); if (isnan (val)) - return nanf (NULL); + return nanf (""); float retval = (float) val; #ifndef NO_ERRNO if (isinf (retval) && !isinf (val)) @@ -268,7 +268,7 @@ wcstof (const wchar_t *__restrict nptr, { double val = _wcstod_l (_REENT, nptr, endptr, __get_current_locale ()); if (isnan (val)) - return nanf (NULL); + return nanf (""); float retval = (float) val; #ifndef NO_ERRNO if (isinf (retval) && !isinf (val)) |