From 456c510f181f53e3e4cbf660260be0cbf2e0158c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:09:12 +0100 Subject: [PATCH] ceilf: Provide function definition on MSVC. * m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Test also whether ceilf can be used as a function pointer. * lib/math.in.h (ceilf): Undefine if it is not declared as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/ceilf.m4 | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7c5d2455..5caea84dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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. + * lib/math.in.h (ceilf): Undefine if it is not declared as a function. + +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. diff --git a/lib/math.in.h b/lib/math.in.h index d573741f4..e9421b3e1 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -262,6 +262,7 @@ _GL_FUNCDECL_RPL (ceilf, float, (float x)); _GL_CXXALIAS_RPL (ceilf, float, (float x)); # else # if !@HAVE_DECL_CEILF@ +# undef ceilf _GL_FUNCDECL_SYS (ceilf, float, (float x)); # endif _GL_CXXALIAS_SYS (ceilf, float, (float x)); diff --git a/m4/ceilf.m4 b/m4/ceilf.m4 index 1552e70af..6212d7f1f 100644 --- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 12 +# ceilf.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, @@ -82,8 +82,9 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + float (*funcptr) (float) = ceilf; float x;]], - [[x = ceilf(x);]])], + [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm=]) if test "$gl_cv_func_ceilf_libm" = "?"; then save_LIBS="$LIBS" @@ -94,8 +95,9 @@ AC_DEFUN([gl_FUNC_CEILF_LIBS], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + float (*funcptr) (float) = ceilf; float x;]], - [[x = ceilf(x);]])], + [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm="-lm"]) LIBS="$save_LIBS" fi -- 2.11.0