From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77673 invoked by alias); 29 Aug 2018 14:01:23 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 77345 invoked by uid 9078); 29 Aug 2018 14:01:07 -0000 Date: Wed, 29 Aug 2018 14:01:00 -0000 Message-ID: <20180829140107.77342.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Use nanf("") instead of nanf(NULL) X-Act-Checkin: newlib-cygwin X-Git-Author: Keith Packard X-Git-Refname: refs/heads/master X-Git-Oldrev: 9e032fd939a188b38ab36b6e94c93056ed347952 X-Git-Newrev: 2c245028afa4883163c6ad7d04da9f7b7745b3b4 X-SW-Source: 2018-q3/txt/msg00102.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2c245028afa4883163c6ad7d04da9f7b7745b3b4 commit 2c245028afa4883163c6ad7d04da9f7b7745b3b4 Author: Keith Packard Date: Mon Aug 27 11:32:28 2018 -0700 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 Diff: --- newlib/libc/stdio/nano-vfscanf_float.c | 2 +- newlib/libc/stdio/vfscanf.c | 2 +- newlib/libc/stdio/vfwscanf.c | 2 +- newlib/libc/stdlib/strtod.c | 4 ++-- 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 a81fe7f..5df9f22 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 080dcf4..9c38eeb 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 c3470a1..0464b08 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 431d3ab..2a76b10 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 9e0d563..810c5b3 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))