# HG changeset patch # User Bruno Haible # Date 1330129468 -3600 # Node ID 68bd0cc2f6ddbdb97297c25df5761dc8c4ec9b6f # Parent 11a860d6f42d8eb36c8c056b6cc695d6b2e1ba19 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. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. diff --git a/lib/math.in.h b/lib/math.in.h --- a/lib/math.in.h +++ b/lib/math.in.h @@ -420,6 +420,7 @@ #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 --- 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 @@ # 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 @@ # 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"