From d5b42fa052975e78f62266b2227a6980ad0e1b68 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:31:58 +0100 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/cosl.m4 | 10 +++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf95cc278b..5de730bb16 100644 --- 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 index 0e8ce7d6ef..3de111ed1e 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -374,6 +374,7 @@ _GL_WARN_ON_USE (cosf, "cosf is unportable - " #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 index 0f140c4c1c..961953d421 100644 --- 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 @@ AC_DEFUN([gl_FUNC_COSL], # 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 @@ AC_DEFUN([gl_FUNC_COSL], # 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" -- 2.39.5