Mercurial > hg > octave-lojdl > gnulib-hg

changeset 16396:fd53e49c3d9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
logl: Provide function definition on MSVC. * m4/logl.m4 (gl_FUNC_LOGL): Test also whether logl can be used as a function pointer. * lib/math.in.h (logl): Undefine if it does not exist as a function.
author Bruno Haible <bruno@clisp.org>
date Sat, 25 Feb 2012 01:27:00 +0100
parents 68bd0cc2f6dd
children 3dd8fb89c3a4
files ChangeLog lib/math.in.h m4/logl.m4
diffstat 3 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-24  Bruno Haible  <bruno@clisp.org>
+
+	logl: Provide function definition on MSVC.
+	* m4/logl.m4 (gl_FUNC_LOGL): Test also whether logl can be used as a
+	function pointer.
+	* lib/math.in.h (logl): Undefine if it does not exist as a function.
+
 2012-02-24  Bruno Haible  <bruno@clisp.org>
 
 	expl: Provide function definition on MSVC.
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -768,6 +768,7 @@
 
 #if @GNULIB_LOGL@
 # if !@HAVE_LOGL@ || !@HAVE_DECL_LOGL@
+#  undef logl
 _GL_FUNCDECL_SYS (logl, long double, (long double x));
 # endif
 _GL_CXXALIAS_SYS (logl, long double, (long double x));
--- a/m4/logl.m4
+++ b/m4/logl.m4
@@ -1,4 +1,4 @@
-# logl.m4 serial 6
+# logl.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 <math.h>
+             long double (*funcptr) (long double) = logl;
              long double x;]],
-           [[return logl (x) > 1;]])],
+           [[return funcptr (x) > 1
+                    || logl (x) > 1;]])],
         [gl_cv_func_logl_no_libm=yes],
         [gl_cv_func_logl_no_libm=no])
     ])
@@ -39,8 +41,10 @@
                # define __NO_MATH_INLINES 1 /* for glibc */
                #endif
                #include <math.h>
+               long double (*funcptr) (long double) = logl;
                long double x;]],
-             [[return logl (x) > 1;]])],
+             [[return funcptr (x) > 1
+                      || logl (x) > 1;]])],
           [gl_cv_func_logl_in_libm=yes],
           [gl_cv_func_logl_in_libm=no])
         LIBS="$save_LIBS"