From 05a3d01cfc714ee6b895720cac3ca565271a7b6f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:15:03 +0100 Subject: [PATCH] floorl: Provide function definition on MSVC. * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Test also whether floorl can be used as a function pointer. * lib/math.in.h (floorl): Undefine if it is not declared as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/floorl.m4 | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5caea84dd..fc90f6d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-02-24 Bruno Haible + floorl: Provide function definition on MSVC. + * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Test also whether floorl can be + used as a function pointer. + * lib/math.in.h (floorl): Undefine if it is not declared as a function. + +2012-02-24 Bruno Haible + ceilf: Provide function definition on MSVC. * m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Test also whether ceilf can be used as a function pointer. diff --git a/lib/math.in.h b/lib/math.in.h index e9421b3e1..d9db7c37f 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -495,6 +495,7 @@ _GL_FUNCDECL_RPL (floorl, long double, (long double x)); _GL_CXXALIAS_RPL (floorl, long double, (long double x)); # else # if !@HAVE_DECL_FLOORL@ +# undef floorl _GL_FUNCDECL_SYS (floorl, long double, (long double x)); # endif _GL_CXXALIAS_SYS (floorl, long double, (long double x)); diff --git a/m4/floorl.m4 b/m4/floorl.m4 index 5a6be0c87..eb8c846d3 100644 --- a/m4/floorl.m4 +++ b/m4/floorl.m4 @@ -1,4 +1,4 @@ -# floorl.m4 serial 10 +# floorl.m4 serial 11 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, @@ -49,8 +49,9 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = floorl; long double x;]], - [[x = floorl(x);]])], + [[x = funcptr (x) + floorl(x);]])], [gl_cv_func_floorl_libm=]) if test "$gl_cv_func_floorl_libm" = "?"; then save_LIBS="$LIBS" @@ -61,8 +62,9 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = floorl; long double x;]], - [[x = floorl(x);]])], + [[x = funcptr (x) + floorl(x);]])], [gl_cv_func_floorl_libm="-lm"]) LIBS="$save_LIBS" fi -- 2.11.0