From ab624c1a8f744419fdb653b77250153a3563203f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:07:19 +0100 Subject: [PATCH] floorf: Provide function definition on MSVC. * m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Test also whether floorf can be used as a function pointer. * lib/math.in.h (floorf): Undefine if it is not declared as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/floorf.m4 | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7a6e1071..b7c5d2455 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-24 Bruno Haible + + floorf: Provide function definition on MSVC. + * m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Test also whether floorf can be + used as a function pointer. + * lib/math.in.h (floorf): Undefine if it is not declared as a function. + 2012-02-24 Paul Eggert stdnoreturn: new module diff --git a/lib/math.in.h b/lib/math.in.h index 0271afe82..d573741f4 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -457,6 +457,7 @@ _GL_FUNCDECL_RPL (floorf, float, (float x)); _GL_CXXALIAS_RPL (floorf, float, (float x)); # else # if !@HAVE_DECL_FLOORF@ +# undef floorf _GL_FUNCDECL_SYS (floorf, float, (float x)); # endif _GL_CXXALIAS_SYS (floorf, float, (float x)); diff --git a/m4/floorf.m4 b/m4/floorf.m4 index 2fca31245..6e792a1ff 100644 --- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 11 +# floorf.m4 serial 12 dnl Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -78,8 +78,9 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + float (*funcptr) (float) = floorf; float x;]], - [[x = floorf(x);]])], + [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm=]) if test "$gl_cv_func_floorf_libm" = "?"; then save_LIBS="$LIBS" @@ -90,8 +91,9 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + float (*funcptr) (float) = floorf; float x;]], - [[x = floorf(x);]])], + [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm="-lm"]) LIBS="$save_LIBS" fi -- 2.11.0