From 9ed19d3e05a36ad66942c4db88058b07764c8c6b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:24:28 +0100 Subject: [PATCH] expl: Provide function definition on MSVC. * m4/expl.m4 (gl_FUNC_EXPL): Test also whether expl can be used as a function pointer. * lib/math.in.h (expl): Undefine if it does not exist as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/expl.m4 | 10 +++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a20ab6467..00e623ee9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-02-24 Bruno Haible + expl: Provide function definition on MSVC. + * m4/expl.m4 (gl_FUNC_EXPL): Test also whether expl can be used as a + function pointer. + * lib/math.in.h (expl): Undefine if it does not exist as a function. + +2012-02-24 Bruno Haible + sqrtl: Provide function definition on MSVC. * m4/sqrtl.m4 (gl_FUNC_SQRTL): Test also whether sqrtl can be used as a function pointer. diff --git a/lib/math.in.h b/lib/math.in.h index bfe322202..25f25036b 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -420,6 +420,7 @@ _GL_WARN_ON_USE (expf, "expf is unportable - " #if @GNULIB_EXPL@ # if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@ +# undef expl _GL_FUNCDECL_SYS (expl, long double, (long double x)); # endif _GL_CXXALIAS_SYS (expl, long double, (long double x)); diff --git a/m4/expl.m4 b/m4/expl.m4 index 99a5d1239..8bf7378d3 100644 --- a/m4/expl.m4 +++ b/m4/expl.m4 @@ -1,4 +1,4 @@ -# expl.m4 serial 5 +# expl.m4 serial 6 dnl Copyright (C) 2010-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, @@ -22,8 +22,10 @@ AC_DEFUN([gl_FUNC_EXPL], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = expl; long double x;]], - [[return expl (x) > 1.5;]])], + [[return funcptr (x) > 1.5 + || expl (x) > 1.5;]])], [gl_cv_func_expl_no_libm=yes], [gl_cv_func_expl_no_libm=no]) ]) @@ -39,8 +41,10 @@ AC_DEFUN([gl_FUNC_EXPL], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = expl; long double x;]], - [[return expl (x) > 1.5;]])], + [[return funcptr (x) > 1.5 + || expl (x) > 1.5;]])], [gl_cv_func_expl_in_libm=yes], [gl_cv_func_expl_in_libm=no]) LIBS="$save_LIBS" -- 2.11.0