Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16395:68bd0cc2f6dd
expl: Provide function definition on MSVC.
* m4/expl.m4 (gl_FUNC_EXPL): Test also whether expl can be used as a
function pointer.
* lib/math.in.h (expl): Undefine if it does not exist as a function.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 25 Feb 2012 01:24:28 +0100 |
| parents | 11a860d6f42d |
| children | fd53e49c3d9c |
| files | ChangeLog lib/math.in.h m4/expl.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> + + expl: Provide function definition on MSVC. + * m4/expl.m4 (gl_FUNC_EXPL): Test also whether expl can be used as a + function pointer. + * lib/math.in.h (expl): Undefine if it does not exist as a function. + 2012-02-24 Bruno Haible <bruno@clisp.org> sqrtl: Provide function definition on MSVC.
--- a/lib/math.in.h +++ b/lib/math.in.h @@ -420,6 +420,7 @@ #if @GNULIB_EXPL@ # if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@ +# undef expl _GL_FUNCDECL_SYS (expl, long double, (long double x)); # endif _GL_CXXALIAS_SYS (expl, long double, (long double x));
--- a/m4/expl.m4 +++ b/m4/expl.m4 @@ -1,4 +1,4 @@ -# expl.m4 serial 5 +# expl.m4 serial 6 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) = expl; long double x;]], - [[return expl (x) > 1.5;]])], + [[return funcptr (x) > 1.5 + || expl (x) > 1.5;]])], [gl_cv_func_expl_no_libm=yes], [gl_cv_func_expl_no_libm=no]) ]) @@ -39,8 +41,10 @@ # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include <math.h> + long double (*funcptr) (long double) = expl; long double x;]], - [[return expl (x) > 1.5;]])], + [[return funcptr (x) > 1.5 + || expl (x) > 1.5;]])], [gl_cv_func_expl_in_libm=yes], [gl_cv_func_expl_in_libm=no]) LIBS="$save_LIBS"