Mercurial > hg > octave-nkf > gnulib-hg
changeset 9312:bec01fc15c2f
Rename parameter 'exp' to 'expptr', to avoid gcc warnings.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 07 Oct 2007 22:10:35 +0200 |
| parents | 404565280e7d |
| children | 59fc463c9868 |
| files | ChangeLog lib/frexp.c lib/math.in.h lib/printf-frexp.c lib/printf-frexp.h lib/printf-frexpl.h |
| diffstat | 6 files changed, 23 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-10-07 Bruno Haible <bruno@clisp.org> + + Avoid gcc warnings "declaration of 'exp' shadows a global declaration". + * lib/math.in.h (frexp, frexpl): Change parameter name to 'expptr'. + * lib/frexp.c (FUNC): Likewise. + * lib/printf-frexp.h (printf_frexp): Likewise. + * lib/printf-frexpl.h (printf_frexpl): Likewise. + * lib/printf-frexp.c (FUNC): Likewise. + Suggested by Jim Meyering. + 2007-10-07 Jim Meyering <meyering@redhat.com> Make xnanosleep's integer overflow test more robust.
--- a/lib/frexp.c +++ b/lib/frexp.c @@ -53,7 +53,7 @@ #endif DOUBLE -FUNC (DOUBLE x, int *exp) +FUNC (DOUBLE x, int *expptr) { int sign; int exponent; @@ -62,7 +62,7 @@ /* Test for NaN, infinity, and zero. */ if (ISNAN (x) || x + x == x) { - *exp = 0; + *expptr = 0; return x; } @@ -161,6 +161,6 @@ END_ROUNDING (); - *exp = exponent; + *expptr = exponent; return x; }
--- a/lib/math.in.h +++ b/lib/math.in.h @@ -38,11 +38,11 @@ If x finite and nonzero: 0.5 <= |mantissa| < 1.0. If x is zero: mantissa = x, exp = 0. If x is infinite or NaN: mantissa = x, exp unspecified. - Store exp and return mantissa. */ + Store exp in *EXPPTR and return mantissa. */ #if @GNULIB_FREXP@ # if @REPLACE_FREXP@ # define frexp rpl_frexp -extern double frexp (double x, int *exp); +extern double frexp (double x, int *expptr); # endif #elif defined GNULIB_POSIXCHECK # undef frexp @@ -173,12 +173,12 @@ If x finite and nonzero: 0.5 <= |mantissa| < 1.0. If x is zero: mantissa = x, exp = 0. If x is infinite or NaN: mantissa = x, exp unspecified. - Store exp and return mantissa. */ + Store exp in *EXPPTR and return mantissa. */ #if @GNULIB_FREXPL@ && @REPLACE_FREXPL@ # define frexpl rpl_frexpl #endif #if (@GNULIB_FREXPL@ && @REPLACE_FREXPL@) || !@HAVE_DECL_FREXPL@ -extern long double frexpl (long double x, int *exp); +extern long double frexpl (long double x, int *expptr); #endif #if !@GNULIB_FREXPL@ && defined GNULIB_POSIXCHECK # undef frexpl
--- a/lib/printf-frexp.c +++ b/lib/printf-frexp.c @@ -62,7 +62,7 @@ #endif DOUBLE -FUNC (DOUBLE x, int *exp) +FUNC (DOUBLE x, int *expptr) { int exponent; DECL_ROUNDING @@ -183,6 +183,6 @@ END_ROUNDING (); - *exp = exponent; + *expptr = exponent; return x; }
--- a/lib/printf-frexp.h +++ b/lib/printf-frexp.h @@ -19,5 +19,5 @@ where exp >= DBL_MIN_EXP - 1, mantissa < 2.0, if x is not a denormalized number then mantissa >= 1.0. - Store exp and return mantissa. */ -extern double printf_frexp (double x, int *exp); + Store exp in *EXPPTR and return mantissa. */ +extern double printf_frexp (double x, int *expptr);
--- a/lib/printf-frexpl.h +++ b/lib/printf-frexpl.h @@ -19,5 +19,5 @@ where exp >= LDBL_MIN_EXP - 1, mantissa < 2.0, if x is not a denormalized number then mantissa >= 1.0. - Store exp and return mantissa. */ -extern long double printf_frexpl (long double x, int *exp); + Store exp in *EXPPTR and return mantissa. */ +extern long double printf_frexpl (long double x, int *expptr);