Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16390:60e9584368df
floorf: Provide function definition on MSVC.
* m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Test also whether floorf can be
used as a function pointer.
* lib/math.in.h (floorf): Undefine if it is not declared as a function.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 25 Feb 2012 01:07:19 +0100 |
| parents | a9eaa22dc3f6 |
| children | 4576be79e9e7 |
| files | ChangeLog lib/math.in.h m4/floorf.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> + + floorf: Provide function definition on MSVC. + * m4/floorf.m4 (gl_FUNC_FLOORF_LIBS): Test also whether floorf can be + used as a function pointer. + * lib/math.in.h (floorf): Undefine if it is not declared as a function. + 2012-02-24 Paul Eggert <eggert@cs.ucla.edu> stdnoreturn: new module
--- a/lib/math.in.h +++ b/lib/math.in.h @@ -457,6 +457,7 @@ _GL_CXXALIAS_RPL (floorf, float, (float x)); # else # if !@HAVE_DECL_FLOORF@ +# undef floorf _GL_FUNCDECL_SYS (floorf, float, (float x)); # endif _GL_CXXALIAS_SYS (floorf, float, (float x));
--- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 11 +# floorf.m4 serial 12 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, @@ -78,8 +78,9 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include <math.h> + float (*funcptr) (float) = floorf; float x;]], - [[x = floorf(x);]])], + [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm=]) if test "$gl_cv_func_floorf_libm" = "?"; then save_LIBS="$LIBS" @@ -90,8 +91,9 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include <math.h> + float (*funcptr) (float) = floorf; float x;]], - [[x = floorf(x);]])], + [[x = funcptr(x) + floorf(x);]])], [gl_cv_func_floorf_libm="-lm"]) LIBS="$save_LIBS" fi