+2011-10-09 Bruno Haible <bruno@clisp.org>
+
+ floorl: Simplify for platforms where 'long double' == 'double'.
+ * lib/floorl.c: Include <config.h>.
+ (floorl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New function.
+ * lib/floor.c [!USE_LONG_DOUBLE]: Don't include <config.h> a second
+ time.
+ * m4/floorl.m4 (gl_FUNC_FLOORL): Require gl_LONG_DOUBLE_VS_DOUBLE.
+ Determine FLOORL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
+ * modules/floorl (Depends-on): Add floor. Update conditions.
+
2011-10-09 Bruno Haible <bruno@clisp.org>
rint: Fix ordering constraints.
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
-#define USE_LONG_DOUBLE
-#include "floor.c"
+#include <config.h>
+
+#if HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+
+/* Specification. */
+# include <math.h>
+
+long double
+floorl (long double x)
+{
+ return floor (x);
+}
+
+#else
+
+# define USE_LONG_DOUBLE
+# include "floor.c"
+
+#endif
-# floorl.m4 serial 9
+# floorl.m4 serial 10
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
AC_DEFUN([gl_FUNC_FLOORL],
[
AC_REQUIRE([gl_MATH_H_DEFAULTS])
+ AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
dnl Persuade glibc <math.h> to declare floorl().
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
dnl Test whether floorl() is declared.
AC_CHECK_DECLS([floorl], , , [[#include <math.h>]])
if test "$ac_cv_have_decl_floorl" = yes; then
HAVE_DECL_FLOORL=0
fi
if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then
- dnl No libraries are needed to link lib/floorl.c.
- FLOORL_LIBM=
+ dnl Find libraries needed to link lib/floorl.c.
+ if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+ AC_REQUIRE([gl_FUNC_FLOOR])
+ FLOORL_LIBM="$FLOOR_LIBM"
+ else
+ FLOORL_LIBM=
+ fi
fi
AC_SUBST([FLOORL_LIBM])
])
Depends-on:
math
extensions
-float [test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1]
+floor [{ test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
+float [{ test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
configure.ac:
gl_FUNC_FLOORL