changeset 16393:43820240f265

ceill: Provide function definition on MSVC. * m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Test also whether ceill can be used as a function pointer. * lib/math.in.h (ceill): Undefine if it is not declared as a function.
author Bruno Haible <bruno@clisp.org>
date Sat, 25 Feb 2012 01:17:22 +0100
parents 7e35e3b2a920
children 11a860d6f42d
files ChangeLog lib/math.in.h m4/ceill.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>
+
+	ceill: Provide function definition on MSVC.
+	* m4/ceill.m4 (gl_FUNC_CEILL_LIBS): Test also whether ceill can be
+	used as a function pointer.
+	* lib/math.in.h (ceill): Undefine if it is not declared as a function.
+
 2012-02-24  Bruno Haible  <bruno@clisp.org>
 
 	floorl: Provide function definition on MSVC.
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -299,6 +299,7 @@
 _GL_CXXALIAS_RPL (ceill, long double, (long double x));
 # else
 #  if !@HAVE_DECL_CEILL@
+#   undef ceill
 _GL_FUNCDECL_SYS (ceill, long double, (long double x));
 #  endif
 _GL_CXXALIAS_SYS (ceill, long double, (long double x));
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -1,4 +1,4 @@
-# ceill.m4 serial 12
+# ceill.m4 serial 13
 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,
@@ -86,8 +86,9 @@
            # define __NO_MATH_INLINES 1 /* for glibc */
            #endif
            #include <math.h>
+           long double (*funcptr) (long double) = ceill;
            long double x;]],
-         [[x = ceill(x);]])],
+         [[x = funcptr(x) + ceill(x);]])],
       [gl_cv_func_ceill_libm=])
     if test "$gl_cv_func_ceill_libm" = "?"; then
       save_LIBS="$LIBS"
@@ -98,8 +99,9 @@
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = ceill;
              long double x;]],
-           [[x = ceill(x);]])],
+           [[x = funcptr(x) + ceill(x);]])],
         [gl_cv_func_ceill_libm="-lm"])
       LIBS="$save_LIBS"
     fi