Mercurial > hg > octave-lojdl > gnulib-hg

changeset 9466:1013cba29012

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle the case that floorl and roundl are declared but do not exist.
author Bruno Haible <bruno@clisp.org>
date Sun, 11 Nov 2007 14:08:25 +0100
parents 4a3319c82e39
children 08b76f84ac5d
files ChangeLog lib/round.c m4/roundf.m4 m4/roundl.m4
diffstat 4 files changed, 24 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-11  Bruno Haible  <bruno@clisp.org>
+
+	* m4/roundf.m4 (gl_FUNC_ROUNDF): Handle the case that floorf and
+	roundf were declared but do not exist on functions.
+	* m4/roundl.m4 (gl_FUNC_ROUNDL): Handle the case that floorl and
+	roundl were declared but do not exist on functions.
+	* lib/round.c (HAVE_FLOOR_AND_CEIL): Use HAVE_FLOORF_AND_CEILF and
+	HAVE_FLOORL_AND_CEILL, respectively.
+	Needed for Sun C on Solaris 10.
+
 2007-11-11  Bruno Haible  <bruno@clisp.org>
 
 	* m4/roundf.m4 (gl_FUNC_ROUNDF): Set REPLACE_ROUNDF instead of
--- a/lib/round.c
+++ b/lib/round.c
@@ -30,7 +30,7 @@
 # define DOUBLE long double
 # define MANT_DIG LDBL_MANT_DIG
 # define L_(literal) literal##L
-# define HAVE_FLOOR_AND_CEIL (HAVE_DECL_FLOORL && HAVE_DECL_CEILL)
+# define HAVE_FLOOR_AND_CEIL HAVE_FLOORL_AND_CEILL
 #elif ! defined USE_FLOAT
 # define ROUND round
 # define FLOOR floor
@@ -46,7 +46,7 @@
 # define DOUBLE float
 # define MANT_DIG FLT_MANT_DIG
 # define L_(literal) literal##f
-# define HAVE_FLOOR_AND_CEIL (HAVE_DECL_FLOORF && HAVE_DECL_CEILF)
+# define HAVE_FLOOR_AND_CEIL HAVE_FLOORF_AND_CEILF
 #endif
 
 /* If we're being included from test-round2[f].c, it already defined names for
--- a/m4/roundf.m4
+++ b/m4/roundf.m4
@@ -20,6 +20,12 @@
     if test "$ac_cv_have_decl_floorf" = yes \
        && test "$ac_cv_have_decl_ceilf" = yes; then
       gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = floorf (x) + ceilf (x);])
+      if test "$ROUNDF_LIBM" != missing; then
+        AC_DEFINE([HAVE_FLOORF_AND_CEILF], 1,
+          [Define if the both the floorf() and ceilf() functions exist.])
+      else
+        ROUNDF_LIBM=
+      fi
     else
       ROUNDF_LIBM=
     fi
--- a/m4/roundl.m4
+++ b/m4/roundl.m4
@@ -20,6 +20,12 @@
     if test "$ac_cv_have_decl_floorl" = yes \
        && test "$ac_cv_have_decl_ceill" = yes; then
       gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = floorl (x) + ceill (x);])
+      if test "$ROUNDL_LIBM" != missing; then
+        AC_DEFINE([HAVE_FLOORL_AND_CEILL], 1,
+          [Define if the both the floorl() and ceill() functions exist.])
+      else
+        ROUNDL_LIBM=
+      fi
     else
       ROUNDL_LIBM=
     fi