From d23df56e2060a3f468b8c6b069c0b87f6c15b774 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 5 Oct 2007 03:54:50 +0200 Subject: [PATCH] New module 'ceill'. --- ChangeLog | 12 ++++++++++++ doc/functions/ceill.texi | 8 ++++---- lib/ceill.c | 35 +++++------------------------------ lib/math.in.h | 10 ++++++---- m4/ceill.m4 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ m4/math_h.m4 | 1 + modules/ceill | 31 +++++++++++++++++++++++++++++++ modules/math | 1 + modules/mathl | 2 +- 9 files changed, 109 insertions(+), 39 deletions(-) create mode 100644 m4/ceill.m4 create mode 100644 modules/ceill diff --git a/ChangeLog b/ChangeLog index 6f7bd02a9..2f226a456 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2007-10-04 Bruno Haible + * modules/ceill: New file. + * lib/ceill.c: Replace entire file. + * m4/ceill.m4: New file. + * lib/math.in.h (ceill): Replace declaration. + * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize GNULIB_CEILL. + * modules/math (Makefile.am): Substitute also GNULIB_CEILL. + * doc/functions/ceill.texi: Mention the 'ceill' module. + * modules/mathl (Files): Remove lib/ceill.c. + (Depends-on): Add ceill. + +2007-10-04 Bruno Haible + * modules/ceilf-tests: New file. * tests/test-ceilf.c: New file. diff --git a/doc/functions/ceill.texi b/doc/functions/ceill.texi index ed5006fd8..eb12db2b2 100644 --- a/doc/functions/ceill.texi +++ b/doc/functions/ceill.texi @@ -4,15 +4,15 @@ POSIX specification: @url{http://www.opengroup.org/susv3xsh/ceill.html} -Gnulib module: --- +Gnulib module: ceill Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +FreeBSD 5.2.1, NetBSD 3.0, OpenBSD 3.8, HP-UX 11, IRIX 6.5, Solaris 9, Cygwin, Interix 3.5, BeOS. @end itemize Portability problems not fixed by Gnulib: @itemize -@item -This function is missing on some platforms: -FreeBSD 5.2.1, NetBSD 3.0, OpenBSD 3.8, HP-UX 11, IRIX 6.5, Solaris 9, Cygwin, Interix 3.5, BeOS. @end itemize diff --git a/lib/ceill.c b/lib/ceill.c index 9eb1ba07c..4c65cd2df 100644 --- a/lib/ceill.c +++ b/lib/ceill.c @@ -1,9 +1,5 @@ -/* Emulation for ceill. - Contributed by Paolo Bonzini - - Copyright 2002, 2003, 2007 Free Software Foundation, Inc. - - This file is part of gnulib. +/* Round towards positive infinity. + Copyright (C) 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,28 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include - -/* Specification. */ -#include - -#include - -/* To compute the integer part of X, sum a big enough - integer so that the precision of the floating point - number is exactly 1. */ - -long double -ceill(long double x) -{ - long double y; - if (x < 0.0L) - y = -(1.0L / LDBL_EPSILON - x - 1.0 / LDBL_EPSILON); - else - y = 1.0L / LDBL_EPSILON + x - 1.0 / LDBL_EPSILON; +/* Written by Bruno Haible , 2007. */ - if (y < x) - return y + 1.0L; - else - return y; -} +#define USE_LONG_DOUBLE +#include "ceil.c" diff --git a/lib/math.in.h b/lib/math.in.h index ef0682af5..b5dc1ea1e 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -103,14 +103,16 @@ extern float ceilf (float x); ceilf (x)) #endif -#if @GNULIB_MATHL@ || !@HAVE_DECL_CEILL@ +#if @GNULIB_CEILL@ +# if !@HAVE_DECL_CEILL@ +# define ceill rpl_ceill extern long double ceill (long double x); -#endif -#if !@GNULIB_MATHL@ && defined GNULIB_POSIXCHECK +# endif +#elif defined GNULIB_POSIXCHECK # undef ceill # define ceill(x) \ (GL_LINK_WARNING ("ceill is unportable - " \ - "use gnulib module mathl for portability"), \ + "use gnulib module ceill for portability"), \ ceill (x)) #endif diff --git a/m4/ceill.m4 b/m4/ceill.m4 new file mode 100644 index 000000000..7413a3110 --- /dev/null +++ b/m4/ceill.m4 @@ -0,0 +1,48 @@ +# ceill.m4 serial 1 +dnl Copyright (C) 2007 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_CEILL], +[ + AC_REQUIRE([gl_MATH_H_DEFAULTS]) + dnl Persuade glibc to declare ceill(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + dnl Test whether ceill() is declared. + AC_CHECK_DECLS([ceill], , , [#include ]) + if test "$ac_cv_have_decl_ceill" = yes; then + dnl Test whether ceill() can be used without libm. + CEILL_LIBM=? + AC_TRY_LINK([ + #ifndef __NO_MATH_INLINES + # define __NO_MATH_INLINES 1 /* for glibc */ + #endif + #include + long double x;], + [x = ceill(x);], + [CEILL_LIBM=]) + if test "$CEILL_LIBM" = "?"; then + save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([ + #ifndef __NO_MATH_INLINES + # define __NO_MATH_INLINES 1 /* for glibc */ + #endif + #include + long double x;], + [x = ceill(x);], + [CEILL_LIBM="-lm"]) + LIBS="$save_LIBS" + fi + if test "$CEILL_LIBM" = "?"; then + CEILL_LIBM= + fi + else + HAVE_DECL_CEILL=0 + AC_LIBOBJ([ceill]) + CEILL_LIBM= + fi + AC_SUBST([HAVE_DECL_CEILL]) + AC_SUBST([CEILL_LIBM]) +]) diff --git a/m4/math_h.m4 b/m4/math_h.m4 index 76d5dbc59..5539d792f 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -20,6 +20,7 @@ AC_DEFUN([gl_MATH_MODULE_INDICATOR], AC_DEFUN([gl_MATH_H_DEFAULTS], [ GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) + GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) diff --git a/modules/ceill b/modules/ceill new file mode 100644 index 000000000..a2365c272 --- /dev/null +++ b/modules/ceill @@ -0,0 +1,31 @@ +Description: +ceill() function: round towards positive infinity. + +Files: +lib/ceill.c +lib/ceil.c +m4/ceill.m4 + +Depends-on: +math +extensions +float + +configure.ac: +gl_FUNC_CEILL +gl_MATH_MODULE_INDICATOR([ceill]) + +Makefile.am: + +Include: + + +Link: +$(CEILL_LIBM) + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/math b/modules/math index 0a41904d6..15e16e633 100644 --- a/modules/math +++ b/modules/math @@ -23,6 +23,7 @@ math.h: math.in.h sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \ -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \ + -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \ -e 's|@''GNULIB_FLOORF''@|$(GNULIB_FLOORF)|g' \ -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \ -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \ diff --git a/modules/mathl b/modules/mathl index 1008cba64..e8ee82259 100644 --- a/modules/mathl +++ b/modules/mathl @@ -5,7 +5,6 @@ Files: lib/acosl.c lib/asinl.c lib/atanl.c -lib/ceill.c lib/cosl.c lib/expl.c lib/logl.c @@ -24,6 +23,7 @@ frexpl isnanl ldexpl floorl +ceill configure.ac: gl_FUNC_LONG_DOUBLE_MATH -- 2.11.0