math: Avoid macro redefinition warnings on MSVC.

* lib/math.in.h (ceilf, ceill, floorf, floorl, frexpl, ldexpl):
Undefine before redefining.

diff --git a/ChangeLog b/ChangeLog
index 1c87b70..6b18485 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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.
        * doc/posix-functions/*[fl].texi: Mention that some functions are
        defined as macros with arguments only.

diff --git a/lib/math.in.h b/lib/math.in.h
index 05f03b1..afbc9cb 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -187,6 +187,7 @@ _GL_WARN_ON_USE (atanl, "atanl is unportable - "
 #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 @@ _GL_CXXALIASWARN (ceil);
 #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 @@ _GL_WARN_ON_USE (expl, "expl is unportable - "
 #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 @@ _GL_CXXALIASWARN (floor);
 #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 @@ _GL_WARN_ON_USE (floorl, "floorl is unportable - "
    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 @@ _GL_WARN_ON_USE (frexpl, "frexpl is unportable - "
 /* 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));