Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16391:4576be79e9e7
ceilf: Provide function definition on MSVC.
* m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Test also whether ceilf can be
used as a function pointer.
* lib/math.in.h (ceilf): Undefine if it is not declared as a function.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 25 Feb 2012 01:09:12 +0100 |
| parents | 60e9584368df |
| children | 7e35e3b2a920 |
| files | ChangeLog lib/math.in.h m4/ceilf.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> + + ceilf: Provide function definition on MSVC. + * m4/ceilf.m4 (gl_FUNC_CEILF_LIBS): Test also whether ceilf can be + used as a function pointer. + * lib/math.in.h (ceilf): Undefine if it is not declared as a function. + 2012-02-24 Bruno Haible <bruno@clisp.org> floorf: Provide function definition on MSVC.
--- a/lib/math.in.h +++ b/lib/math.in.h @@ -262,6 +262,7 @@ _GL_CXXALIAS_RPL (ceilf, float, (float x)); # else # if !@HAVE_DECL_CEILF@ +# undef ceilf _GL_FUNCDECL_SYS (ceilf, float, (float x)); # endif _GL_CXXALIAS_SYS (ceilf, float, (float x));
--- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 12 +# ceilf.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, @@ -82,8 +82,9 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include <math.h> + float (*funcptr) (float) = ceilf; float x;]], - [[x = ceilf(x);]])], + [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm=]) if test "$gl_cv_func_ceilf_libm" = "?"; then save_LIBS="$LIBS" @@ -94,8 +95,9 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include <math.h> + float (*funcptr) (float) = ceilf; float x;]], - [[x = ceilf(x);]])], + [[x = funcptr(x) + ceilf(x);]])], [gl_cv_func_ceilf_libm="-lm"]) LIBS="$save_LIBS" fi