changeset 16392:7e35e3b2a920

floorl: Provide function definition on MSVC. * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Test also whether floorl can be used as a function pointer. * lib/math.in.h (floorl): Undefine if it is not declared as a function.
author Bruno Haible <bruno@clisp.org>
date Sat, 25 Feb 2012 01:15:03 +0100
parents 4576be79e9e7
children 43820240f265
files ChangeLog lib/math.in.h m4/floorl.m4
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-24  Bruno Haible  <bruno@clisp.org>
+
+	floorl: Provide function definition on MSVC.
+	* m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): Test also whether floorl can be
+	used as a function pointer.
+	* lib/math.in.h (floorl): Undefine if it is not declared as a function.
+
 2012-02-24  Bruno Haible  <bruno@clisp.org>
 
 	ceilf: Provide function definition on MSVC.
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -495,6 +495,7 @@
 _GL_CXXALIAS_RPL (floorl, long double, (long double x));
 # else
 #  if !@HAVE_DECL_FLOORL@
+#   undef floorl
 _GL_FUNCDECL_SYS (floorl, long double, (long double x));
 #  endif
 _GL_CXXALIAS_SYS (floorl, long double, (long double x));
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -1,4 +1,4 @@
-# floorl.m4 serial 10
+# floorl.m4 serial 11
 dnl Copyright (C) 2007, 2009-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,
@@ -49,8 +49,9 @@
            # define __NO_MATH_INLINES 1 /* for glibc */
            #endif
            #include <math.h>
+           long double (*funcptr) (long double) = floorl;
            long double x;]],
-         [[x = floorl(x);]])],
+         [[x = funcptr (x) + floorl(x);]])],
       [gl_cv_func_floorl_libm=])
     if test "$gl_cv_func_floorl_libm" = "?"; then
       save_LIBS="$LIBS"
@@ -61,8 +62,9 @@
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = floorl;
              long double x;]],
-           [[x = floorl(x);]])],
+           [[x = funcptr (x) + floorl(x);]])],
         [gl_cv_func_floorl_libm="-lm"])
       LIBS="$save_LIBS"
     fi