# HG changeset patch # User Bruno Haible # Date 1330129918 -3600 # Node ID 5c120a4f2e7335780bec243ffd4af2a9e3224184 # Parent 3dd8fb89c3a45217328957a90b92e6d19c4def7c cosl: Provide function definition on MSVC. * m4/cosl.m4 (gl_FUNC_COSL): Test also whether cosl can be used as a function pointer. * lib/math.in.h (cosl): 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 + + cosl: Provide function definition on MSVC. + * m4/cosl.m4 (gl_FUNC_COSL): Test also whether cosl can be used as a + function pointer. + * lib/math.in.h (cosl): Undefine if it does not exist as a function. + 2012-02-24 Bruno Haible sinl: 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 @@ -374,6 +374,7 @@ #if @GNULIB_COSL@ # if !@HAVE_COSL@ || !@HAVE_DECL_COSL@ +# undef cosl _GL_FUNCDECL_SYS (cosl, long double, (long double x)); # endif _GL_CXXALIAS_SYS (cosl, long double, (long double x)); diff --git a/m4/cosl.m4 b/m4/cosl.m4 --- a/m4/cosl.m4 +++ b/m4/cosl.m4 @@ -1,4 +1,4 @@ -# cosl.m4 serial 6 +# cosl.m4 serial 7 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) = cosl; long double x;]], - [[return cosl (x) > 0.4;]])], + [[return funcptr (x) > 0.4 + || cosl (x) > 0.4;]])], [gl_cv_func_cosl_no_libm=yes], [gl_cv_func_cosl_no_libm=no]) ]) @@ -39,8 +41,10 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = cosl; long double x;]], - [[return cosl (x) > 0.4;]])], + [[return funcptr (x) > 0.4 + || cosl (x) > 0.4;]])], [gl_cv_func_cosl_in_libm=yes], [gl_cv_func_cosl_in_libm=no]) LIBS="$save_LIBS"