From 9d8101ffbd13243a9e84cef6ee2d2a68476cfff8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Feb 2012 01:30:14 +0100 Subject: [PATCH] sinl: Provide function definition on MSVC. * m4/sinl.m4 (gl_FUNC_SINL): Test also whether sinl can be used as a function pointer. * lib/math.in.h (sinl): Undefine if it does not exist as a function. --- ChangeLog | 7 +++++++ lib/math.in.h | 1 + m4/sinl.m4 | 10 +++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16efe1b2d..cf95cc278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-02-24 Bruno Haible + sinl: Provide function definition on MSVC. + * m4/sinl.m4 (gl_FUNC_SINL): Test also whether sinl can be used as a + function pointer. + * lib/math.in.h (sinl): Undefine if it does not exist as a function. + +2012-02-24 Bruno Haible + logl: Provide function definition on MSVC. * m4/logl.m4 (gl_FUNC_LOGL): Test also whether logl can be used as a function pointer. diff --git a/lib/math.in.h b/lib/math.in.h index a75194bd6..0e8ce7d6e 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -960,6 +960,7 @@ _GL_WARN_ON_USE (sinf, "sinf is unportable - " #if @GNULIB_SINL@ # if !@HAVE_SINL@ || !@HAVE_DECL_SINL@ +# undef sinl _GL_FUNCDECL_SYS (sinl, long double, (long double x)); # endif _GL_CXXALIAS_SYS (sinl, long double, (long double x)); diff --git a/m4/sinl.m4 b/m4/sinl.m4 index 346315835..60e0f76d7 100644 --- a/m4/sinl.m4 +++ b/m4/sinl.m4 @@ -1,4 +1,4 @@ -# sinl.m4 serial 6 +# sinl.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_SINL], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = sinl; long double x;]], - [[return sinl (x) > 0.4;]])], + [[return funcptr (x) > 0.4 + || sinl (x) > 0.4;]])], [gl_cv_func_sinl_no_libm=yes], [gl_cv_func_sinl_no_libm=no]) ]) @@ -39,8 +41,10 @@ AC_DEFUN([gl_FUNC_SINL], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + long double (*funcptr) (long double) = sinl; long double x;]], - [[return sinl (x) > 0.4;]])], + [[return funcptr (x) > 0.4 + || sinl (x) > 0.4;]])], [gl_cv_func_sinl_in_libm=yes], [gl_cv_func_sinl_in_libm=no]) LIBS="$save_LIBS" -- 2.11.0