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

sqrtl: Provide function definition on MSVC.

* m4/sqrtl.m4 (gl_FUNC_SQRTL): Test also whether sqrtl can be used as
a function pointer.
* lib/math.in.h (sqrtl): Undefine if it does not exist as a function.
---

diff --git a/ChangeLog b/ChangeLog
index 6368db17e..a20ab6467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-24  Bruno Haible  <bruno@clisp.org>
 
+	sqrtl: Provide function definition on MSVC.
+	* m4/sqrtl.m4 (gl_FUNC_SQRTL): Test also whether sqrtl can be used as
+	a function pointer.
+	* lib/math.in.h (sqrtl): Undefine if it does not exist as a function.
+
+2012-02-24  Bruno Haible  <bruno@clisp.org>
+
 	ceill: Provide function definition on MSVC.
 	* m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Test also whether ceill can be
 	used as a function pointer.
diff --git a/lib/math.in.h b/lib/math.in.h
index 266790f3c..bfe322202 100644
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -1004,6 +1004,7 @@ _GL_WARN_ON_USE (sqrtf, "sqrtf is unportable - "
 
 #if @GNULIB_SQRTL@
 # if !@HAVE_SQRTL@ || !@HAVE_DECL_SQRTL@
+#  undef sqrtl
 _GL_FUNCDECL_SYS (sqrtl, long double, (long double x));
 # endif
 _GL_CXXALIAS_SYS (sqrtl, long double, (long double x));
diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4
index 3b90c2a63..70de8240b 100644
--- a/m4/sqrtl.m4
+++ b/m4/sqrtl.m4
@@ -1,4 +1,4 @@
-# sqrtl.m4 serial 6
+# sqrtl.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_SQRTL],
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = sqrtl;
              long double x;]],
-           [[return sqrtl (x) > 0.4;]])],
+           [[return funcptr (x) > 0.4
+                    || sqrtl (x) > 0.4;]])],
         [gl_cv_func_sqrtl_no_libm=yes],
         [gl_cv_func_sqrtl_no_libm=no])
     ])
@@ -39,8 +41,10 @@ AC_DEFUN([gl_FUNC_SQRTL],
                # define __NO_MATH_INLINES 1 /* for glibc */
                #endif
                #include <math.h>
+               long double (*funcptr) (long double) = sqrtl;
                long double x;]],
-             [[return sqrtl (x) > 0.4;]])],
+             [[return funcptr (x) > 0.4
+                      || sqrtl (x) > 0.4;]])],
           [gl_cv_func_sqrtl_in_libm=yes],
           [gl_cv_func_sqrtl_in_libm=no])
         LIBS="$save_LIBS"