Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15638:f2a7b56d34a3
math: Avoid macro redefinition warnings on MSVC.
* lib/math.in.h (ceilf, ceill, floorf, floorl, frexpl, ldexpl):
Undefine before redefining.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 17 Sep 2011 17:14:38 +0200 |
| parents | 97060cb2a344 |
| children | 6c1f469caade |
| files | ChangeLog lib/math.in.h |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-17 Bruno Haible <bruno@clisp.org> + + math: Avoid macro redefinition warnings on MSVC. + * lib/math.in.h (ceilf, ceill, floorf, floorl, frexpl, ldexpl): + Undefine before redefining. + 2011-09-17 Bruno Haible <bruno@clisp.org> doc: Mention functions which are declared as macros.
--- a/lib/math.in.h +++ b/lib/math.in.h @@ -187,6 +187,7 @@ #if @GNULIB_CEILF@ # if @REPLACE_CEILF@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ceilf # define ceilf rpl_ceilf # endif _GL_FUNCDECL_RPL (ceilf, float, (float x)); @@ -222,6 +223,7 @@ #if @GNULIB_CEILL@ # if @REPLACE_CEILL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ceill # define ceill rpl_ceill # endif _GL_FUNCDECL_RPL (ceill, long double, (long double x)); @@ -275,6 +277,7 @@ #if @GNULIB_FLOORF@ # if @REPLACE_FLOORF@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef floorf # define floorf rpl_floorf # endif _GL_FUNCDECL_RPL (floorf, float, (float x)); @@ -310,6 +313,7 @@ #if @GNULIB_FLOORL@ # if @REPLACE_FLOORL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef floorl # define floorl rpl_floorl # endif _GL_FUNCDECL_RPL (floorl, long double, (long double x)); @@ -339,6 +343,7 @@ Store exp in *EXPPTR and return mantissa. */ #if @GNULIB_FREXPL@ && @REPLACE_FREXPL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef frexpl # define frexpl rpl_frexpl # endif _GL_FUNCDECL_RPL (frexpl, long double, @@ -368,6 +373,7 @@ /* Return x * 2^exp. */ #if @GNULIB_LDEXPL@ && @REPLACE_LDEXPL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef ldexpl # define ldexpl rpl_ldexpl # endif _GL_FUNCDECL_RPL (ldexpl, long double, (long double x, int exp));