From 9b71dd21dd3425978a8b121335bfca267a45a617 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:17:22 +0100 Subject: [PATCH] ceill: Provide function definition on MSVC. * m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Test also whether ceill can be used as a function pointer. * lib/math.in.h (ceill): Undefine if it is not declared as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/ceill.m4 | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc90f6d2e..6368db17e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-02-24 Bruno Haible + ceill: Provide function definition on MSVC. + * m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Test also whether ceill can be + used as a function pointer. + * lib/math.in.h (ceill): Undefine if it is not declared as a function. + +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. diff --git a/lib/math.in.h b/lib/math.in.h index d9db7c37f..266790f3c 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -299,6 +299,7 @@ _GL_FUNCDECL_RPL (ceill, long double, (long double x)); _GL_CXXALIAS_RPL (ceill, long double, (long double x)); # else # if !@HAVE_DECL_CEILL@ +# undef ceill _GL_FUNCDECL_SYS (ceill, long double, (long double x)); # endif _GL_CXXALIAS_SYS (ceill, long double, (long double x)); diff --git a/m4/ceill.m4 b/m4/ceill.m4 index a628b7e39..700c54b1e 100644 --- a/m4/ceill.m4 +++ b/m4/ceill.m4 @@ -1,4 +1,4 @@ -# ceill.m4 serial 12 +# ceill.m4 serial 13 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, @@ -86,8 +86,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = ceill; long double x;]], - [[x = ceill(x);]])], + [[x = funcptr(x) + ceill(x);]])], [gl_cv_func_ceill_libm=]) if test "$gl_cv_func_ceill_libm" = "?"; then save_LIBS="$LIBS" @@ -98,8 +99,9 @@ AC_DEFUN([gl_FUNC_CEILL_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = ceill; long double x;]], - [[x = ceill(x);]])], + [[x = funcptr(x) + ceill(x);]])], [gl_cv_func_ceill_libm="-lm"]) LIBS="$save_LIBS" fi -- 2.11.0