From: Bruno Haible <bruno@clisp.org>
Date: Sat, 25 Feb 2012 00:31:58 +0000 (+0100)
Subject: cosl: Provide function definition on MSVC.
X-Git-Tag: v0.1~1128
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=d5b42fa052975e78f62266b2227a6980ad0e1b68;p=gnulib.git

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
index cf95cc278..5de730bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-24  Bruno Haible  <bruno@clisp.org>
 
+	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  <bruno@clisp.org>
+
 	sinl: Provide function definition on MSVC.
 	* m4/sinl.m4 (gl_FUNC_SINL): Test also whether sinl can be used as a
 	function pointer.
diff --git a/lib/math.in.h b/lib/math.in.h
index 0e8ce7d6e..3de111ed1 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 0f140c4c1..961953d42 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 <math.h>
+             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 <math.h>
+               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"