Move the isnanf(), isnand(), isnanl() declarations to <math.h>.

diff --git a/ChangeLog b/ChangeLog
index cf1f711b1dbd790daddff3b1f178d7579213b289..72bc4d4241671a5b85563532f36c763923174523 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2008-10-18  Bruno Haible  <bruno@clisp.org>
+
+       * lib/atanl.c: Don't include isnanl.h.
+       * lib/cosl.c: Likewise.
+       * lib/ldexpl.c: Likewise.
+       * lib/logl.c: Likewise.
+       * lib/sinl.c: Likewise.
+       * lib/sqrtl.c: Likewise.
+       * lib/tanl.c: Likewise.
+
+       Move the isnanf(), isnand(), isnanl() declarations to <math.h>.
+       * lib/isnanf.h: Remove file.
+       * lib/isnand.h: Remove file.
+       * lib/isnanl.h: Remove file.
+       * lib/math.in.h: Include the contents of lib/isnanf.h, lib/isnand.h,
+       lib/isnanl.h. Use HAVE_ISNANF, HAVE_ISNAND, HAVE_ISNANL as substituted
+       macros.
+       * m4/isnanf.m4 (gl_FUNC_ISNANF): Require gl_MATH_H_DEFAULTS. Set
+       HAVE_ISNANF, don't define it as a C macro.
+       * m4/isnand.m4 (gl_FUNC_ISNAND): Require gl_MATH_H_DEFAULTS. Set
+       HAVE_ISNAND, don't define it as a C macro.
+       * m4/isnanl.m4 (gl_FUNC_ISNANL): Require gl_MATH_H_DEFAULTS. Set
+       HAVE_ISNANL, don't define it as a C macro.
+       * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize GNULIB_ISNAN[FDL] and
+       HAVE_ISNAN[FDL].
+       * modules/isnanf (Files): Remove lib/isnanf.h.
+       (Depends-on): Add math.
+       (configure.ac): Invoke gl_MATH_MODULE_INDICATOR.
+       (Include): Specify <math.h> instead of isnanf.h.
+       * modules/isnand (Files): Remove lib/isnand.h.
+       (Depends-on): Add math.
+       (configure.ac): Invoke gl_MATH_MODULE_INDICATOR.
+       (Include): Specify <math.h> instead of isnand.h.
+       * modules/isnanl (Files): Remove lib/isnanl.h.
+       (Depends-on): Add math.
+       (configure.ac): Invoke gl_MATH_MODULE_INDICATOR.
+       (Include): Specify <math.h> instead of isnanl.h.
+       * modules/math (Makefile.am): Substitute GNULIB_ISNAN[FDL] and
+       HAVE_ISNAN[FDL].
+       * tests/test-isnanf.c: Include <math.h> instead of isnanf.h.
+       * tests/test-isnand.c: Include <math.h> instead of isnand.h.
+       * tests/test-isnanl.c: Include <math.h> instead of isnanl.h.
+       * NEWS: Mention the change.
+
 2008-10-18  Bruno Haible  <bruno@clisp.org>
 
        Add getusershell(), setusershell(), endusershell() declarations to

diff --git a/NEWS b/NEWS
index 9bd4337f8f8e3b3de95a4b12ae6d10ce99e6d4ea..f4b7d623d7b330b6a8d6ed148168d6ec4bd95836 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,13 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2008-10-19  isnanf          The include file is changed from "isnanf.h" to
+                            <math.h>.
+            isnand          The include file is changed from "isnand.h" to
+                            <math.h>.
+            isnanl          The include file is changed from "isnanl.h" to
+                            <math.h>.
+
 2008-10-18  lchmod          The include file is changed from "lchmod.h" to
                             <sys/stat.h>.
 

diff --git a/lib/atanl.c b/lib/atanl.c
index eca41774d048d369b812229b501a1a44b066c223..19c52e134a20e17b37341c19dae02b3241482d7c 100644 (file)
--- a/lib/atanl.c
+++ b/lib/atanl.c
@@ -62,8 +62,6 @@
  *
  */
 
-#include "isnanl.h"
-
 /* arctan(k/8), k = 0, ..., 82 */
 static const long double atantbl[84] = {
   0.0000000000000000000000000000000000000000E0L,

diff --git a/lib/cosl.c b/lib/cosl.c
index 8a9cb56c0157102200e8c5cb48a4b8ee6bda1e05..20786c147eaabaa766c019a5fba7bf5549518a52 100644 (file)
--- a/lib/cosl.c
+++ b/lib/cosl.c
@@ -54,7 +54,6 @@
 #include "trigl.c"
 #include "sincosl.c"
 #endif
-#include "isnanl.h"
 
 long double cosl(long double x)
 {

diff --git a/lib/isnand.h b/lib/isnand.h
deleted file mode 100644 (file)
index d809aaa..0000000
--- a/lib/isnand.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test for NaN.
-   Copyright (C) 2007-2008 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if HAVE_ISNAND
-/* Get declaration of isnan macro.  */
-# include <math.h>
-# if __GNUC__ >= 4
-   /* GCC 4.0 and newer provides three built-ins for isnan.  */
-#  undef isnand
-#  define isnand(x) __builtin_isnan ((double)(x))
-# else
-#  undef isnand
-#  define isnand(x) isnan ((double)(x))
-# endif
-#else
-/* Test whether X is a NaN.  */
-# undef isnand
-# define isnand rpl_isnand
-extern int isnand (double x);
-#endif

diff --git a/lib/isnanf.h b/lib/isnanf.h
deleted file mode 100644 (file)
index 69492e1..0000000
--- a/lib/isnanf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test for NaN.
-   Copyright (C) 2007-2008 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if HAVE_ISNANF
-/* Get declaration of isnan macro or (older) isnanf function.  */
-# include <math.h>
-# if __GNUC__ >= 4
-   /* GCC 4.0 and newer provides three built-ins for isnan.  */
-#  undef isnanf
-#  define isnanf(x) __builtin_isnanf ((float)(x))
-# elif defined isnan
-#  undef isnanf
-#  define isnanf(x) isnan ((float)(x))
-# endif
-#else
-/* Test whether X is a NaN.  */
-# undef isnanf
-# define isnanf rpl_isnanf
-extern int isnanf (float x);
-#endif

diff --git a/lib/isnanl.h b/lib/isnanl.h
deleted file mode 100644 (file)
index 36a733f..0000000
--- a/lib/isnanl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test for NaN.
-   Copyright (C) 2007-2008 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if HAVE_ISNANL
-/* Get declaration of isnan macro or (older) isnanl function.  */
-# include <math.h>
-# if __GNUC__ >= 4
-   /* GCC 4.0 and newer provides three built-ins for isnan.  */
-#  undef isnanl
-#  define isnanl(x) __builtin_isnanl ((long double)(x))
-# elif defined isnan
-#  undef isnanl
-#  define isnanl(x) isnan ((long double)(x))
-# endif
-#else
-/* Test whether X is a NaN.  */
-# undef isnanl
-# define isnanl rpl_isnanl
-extern int isnanl (long double x);
-#endif

diff --git a/lib/ldexpl.c b/lib/ldexpl.c
index 60474136bbf6a2350dd708bac28d9759018630fc..a783052dee5bf0c092507fb1f0fd2bf04998cec3 100644 (file)
--- a/lib/ldexpl.c
+++ b/lib/ldexpl.c
@@ -1,7 +1,7 @@
 /* Emulation for ldexpl.
    Contributed by Paolo Bonzini
 
-   Copyright 2002, 2003, 2007 Free Software Foundation, Inc.
+   Copyright 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of gnulib.
 
@@ -25,7 +25,6 @@
 
 #include <float.h>
 #include "fpucw.h"
-#include "isnanl.h"
 
 long double
 ldexpl(long double x, int exp)

diff --git a/lib/logl.c b/lib/logl.c
index 4694645813a14faf21ab167a5b3337670ca0b0f3..52adaecc17d08469521f4180efeb227c23601ac6 100644 (file)
--- a/lib/logl.c
+++ b/lib/logl.c
@@ -62,8 +62,6 @@
  *
  */
 
-#include "isnanl.h"
-
 /* log(1+x) = x - .5 x^2 + x^3 l(x)
    -.0078125 <= x <= +.0078125
    peak relative error 1.2e-37 */

diff --git a/lib/math.in.h b/lib/math.in.h
index b7f70b58bdba90650056fb008722d60bfa36c700..c1d6b0a59370eaabd7a87878c0653975da12febb 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -401,25 +401,92 @@ extern int gl_isinfl (long double x);
 #endif
 
 
+#if @GNULIB_ISNANF@
+/* Test for NaN for 'float' numbers.  */
+# if @HAVE_ISNANF@
+/* The original <math.h> included above provides a declaration of isnan macro
+   or (older) isnanf function.  */
+#  include <math.h>
+#  if __GNUC__ >= 4
+    /* GCC 4.0 and newer provides three built-ins for isnan.  */
+#   undef isnanf
+#   define isnanf(x) __builtin_isnanf ((float)(x))
+#  elif defined isnan
+#   undef isnanf
+#   define isnanf(x) isnan ((float)(x))
+#  endif
+# else
+/* Test whether X is a NaN.  */
+#  undef isnanf
+#  define isnanf rpl_isnanf
+extern int isnanf (float x);
+# endif
+#endif
+
+#if @GNULIB_ISNAND@
+/* Test for NaN for 'double' numbers.
+   This function is a gnulib extension, unlike isnan() which applied only
+   to 'double' numbers earlier but now is a type-generic macro.  */
+# if @HAVE_ISNAND@
+/* The original <math.h> included above provides a declaration of isnan macro.  */
+#  include <math.h>
+#  if __GNUC__ >= 4
+    /* GCC 4.0 and newer provides three built-ins for isnan.  */
+#   undef isnand
+#   define isnand(x) __builtin_isnan ((double)(x))
+#  else
+#   undef isnand
+#   define isnand(x) isnan ((double)(x))
+#  endif
+# else
+/* Test whether X is a NaN.  */
+#  undef isnand
+#  define isnand rpl_isnand
+extern int isnand (double x);
+# endif
+#endif
+
+#if @GNULIB_ISNANL@
+/* Test for NaN for 'long double' numbers.  */
+# if @HAVE_ISNANL@
+/* The original <math.h> included above provides a declaration of isnan macro or (older) isnanl function.  */
+#  include <math.h>
+#  if __GNUC__ >= 4
+    /* GCC 4.0 and newer provides three built-ins for isnan.  */
+#   undef isnanl
+#   define isnanl(x) __builtin_isnanl ((long double)(x))
+#  elif defined isnan
+#   undef isnanl
+#   define isnanl(x) isnan ((long double)(x))
+#  endif
+# else
+/* Test whether X is a NaN.  */
+#  undef isnanl
+#  define isnanl rpl_isnanl
+extern int isnanl (long double x);
+# endif
+#endif
+
+/* This must come *after* the snippets for GNULIB_ISNANF and GNULIB_ISNANL!  */
 #if @GNULIB_ISNAN@
 # if @REPLACE_ISNAN@
 /* We can't just use the isnanf macro (e.g.) as exposed by
    isnanf.h (e.g.) here, because those may end up being macros
    that recursively expand back to isnan.  So use the gnulib
    replacements for them directly. */
-#  if HAVE_ISNANF && __GNUC__ >= 4
+#  if @HAVE_ISNANF@ && __GNUC__ >= 4
 #   define gl_isnan_f(x) __builtin_isnan ((float)(x))
 #  else
 extern int rpl_isnanf (float x);
 #   define gl_isnan_f(x) rpl_isnanf (x)
 #  endif
-#  if HAVE_ISNAND && __GNUC__ >= 4
+#  if @HAVE_ISNAND@ && __GNUC__ >= 4
 #   define gl_isnan_d(x) __builtin_isnan ((double)(x))
 #  else
 extern int rpl_isnand (double x);
 #   define gl_isnan_d(x) rpl_isnand (x)
 #  endif
-#  if HAVE_ISNANL && __GNUC__ >= 4
+#  if @HAVE_ISNANL@ && __GNUC__ >= 4
 #   define gl_isnan_l(x) __builtin_isnan ((long double)(x))
 #  else
 extern int rpl_isnanl (long double x);

diff --git a/lib/sinl.c b/lib/sinl.c
index 2c9068f619ea9cb5f663066d9d26a5d2528848b6..918362daa4c42a7a2d7477f32ef170b01016a89a 100644 (file)
--- a/lib/sinl.c
+++ b/lib/sinl.c
@@ -52,7 +52,6 @@
 #include "trigl.h"
 #include "trigl.c"
 #include "sincosl.c"
-#include "isnanl.h"
 
 long double
 sinl (long double x)

diff --git a/lib/sqrtl.c b/lib/sqrtl.c
index 2a4a8abaff62e8a9db26130bf78c146bd9f523cf..701ea2c78d8522b14761a5bfb4b6a4384f10d842 100644 (file)
--- a/lib/sqrtl.c
+++ b/lib/sqrtl.c
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include <float.h>
-#include "isnanl.h"
 
 /* A simple Newton-Raphson method. */
 long double

diff --git a/lib/tanl.c b/lib/tanl.c
index 11b63adfcb65ee461a2d7564cc2210311306db72..60e6637613f2837ca9770ad9571fe342a0ebd92f 100644 (file)
--- a/lib/tanl.c
+++ b/lib/tanl.c
@@ -55,7 +55,6 @@
 #include "trigl.c"
 #endif
 #endif
-#include "isnanl.h"
 
 /*
  * ====================================================

diff --git a/m4/isnand.m4 b/m4/isnand.m4
index fbb03f8795f02d29b0a573ae577f0da1b65f3789..35bdfa7d8f9a107bfe554e2936026df342107172 100644 (file)
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,12 +1,14 @@
-# isnand.m4 serial 4
+# isnand.m4 serial 5
 dnl Copyright (C) 2007-2008 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.
 
 dnl Check how to get or define isnand().
+
 AC_DEFUN([gl_FUNC_ISNAND],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
   ISNAND_LIBM=
   gl_HAVE_ISNAND_NO_LIBM
   if test $gl_cv_func_isnand_no_libm = no; then
@@ -19,10 +21,9 @@ AC_DEFUN([gl_FUNC_ISNAND],
   if test $gl_cv_func_isnand_no_libm = yes \
      || test $gl_cv_func_isnand_in_libm = yes; then
     gl_func_isnand=yes
-    AC_DEFINE([HAVE_ISNAND], 1,
-      [Define if the isnan(double) function is available.])
   else
     gl_func_isnand=no
+    HAVE_ISNAND=0
     gl_BUILD_ISNAND
   fi
   AC_SUBST([ISNAND_LIBM])

diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index 289a49bf4fa3445cbeb38a477f1d23558328d9e5..7d1f25d73be4cf9d77f93a05781ed4762e84bdd5 100644 (file)
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -1,4 +1,4 @@
-# isnanf.m4 serial 8
+# isnanf.m4 serial 9
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,7 @@ dnl Check how to get or define isnanf().
 
 AC_DEFUN([gl_FUNC_ISNANF],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
   ISNANF_LIBM=
   gl_HAVE_ISNANF_NO_LIBM
   if test $gl_cv_func_isnanf_no_libm = no; then
@@ -29,10 +30,8 @@ AC_DEFUN([gl_FUNC_ISNANF],
   else
     gl_func_isnanf=no
   fi
-  if test $gl_func_isnanf = yes; then
-    AC_DEFINE([HAVE_ISNANF], 1,
-      [Define if the isnan(float) function is available.])
-  else
+  if test $gl_func_isnanf != yes; then
+    HAVE_ISNANF=0
     gl_BUILD_ISNANF
   fi
   AC_SUBST([ISNANF_LIBM])

diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index c2f050ffe7fc9814aa85931b8a8594189432c2a2..c5605ee8cb8fd0f797d52bc93d18b1cf62fa011f 100644 (file)
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -1,4 +1,4 @@
-# isnanl.m4 serial 8
+# isnanl.m4 serial 9
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_ISNANL],
 [
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
   ISNANL_LIBM=
   gl_HAVE_ISNANL_NO_LIBM
   if test $gl_cv_func_isnanl_no_libm = no; then
@@ -27,10 +28,8 @@ AC_DEFUN([gl_FUNC_ISNANL],
   else
     gl_func_isnanl=no
   fi
-  if test $gl_func_isnanl = yes; then
-    AC_DEFINE([HAVE_ISNANL], 1,
-      [Define if the isnan(long double) function is available.])
-  else
+  if test $gl_func_isnanl != yes; then
+    HAVE_ISNANL=0
     gl_BUILD_ISNANL
   fi
   AC_SUBST([ISNANL_LIBM])

diff --git a/m4/math_h.m4 b/m4/math_h.m4
index b7a273860469008294192fc3cd24387a7a82ef7b..d941bc334758dd6985f886f4f0dfb629566a6384 100644 (file)
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -1,4 +1,4 @@
-# math_h.m4 serial 13
+# math_h.m4 serial 14
 dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -53,6 +53,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE])
   GNULIB_ISINF=0;    AC_SUBST([GNULIB_ISINF])
   GNULIB_ISNAN=0;    AC_SUBST([GNULIB_ISNAN])
+  GNULIB_ISNANF=0;   AC_SUBST([GNULIB_ISNANF])
+  GNULIB_ISNAND=0;   AC_SUBST([GNULIB_ISNAND])
+  GNULIB_ISNANL=0;   AC_SUBST([GNULIB_ISNANL])
   GNULIB_LDEXPL=0;   AC_SUBST([GNULIB_LDEXPL])
   GNULIB_MATHL=0;    AC_SUBST([GNULIB_MATHL])
   GNULIB_ROUND=0;    AC_SUBST([GNULIB_ROUND])
@@ -63,6 +66,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   GNULIB_TRUNCF=0;   AC_SUBST([GNULIB_TRUNCF])
   GNULIB_TRUNCL=0;   AC_SUBST([GNULIB_TRUNCL])
   dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_ISNANF=1;               AC_SUBST([HAVE_ISNANF])
+  HAVE_ISNAND=1;               AC_SUBST([HAVE_ISNAND])
+  HAVE_ISNANL=1;               AC_SUBST([HAVE_ISNANL])
   HAVE_DECL_ACOSL=1;           AC_SUBST([HAVE_DECL_ACOSL])
   HAVE_DECL_ASINL=1;           AC_SUBST([HAVE_DECL_ASINL])
   HAVE_DECL_ATANL=1;           AC_SUBST([HAVE_DECL_ATANL])

diff --git a/modules/isnand b/modules/isnand
index b88e563d013dd8af5046d1ed32ad594c2d81e3b4..bd6d2e1657ecf736e87888a74bd27e4fa9aa7ff1 100644 (file)
--- a/modules/isnand
+++ b/modules/isnand
@@ -2,7 +2,6 @@ Description:
 isnand() function: test for NaN.
 
 Files:
-lib/isnand.h
 lib/isnand.c
 lib/isnan.c
 lib/float+.h
@@ -10,15 +9,17 @@ m4/exponentd.m4
 m4/isnand.m4
 
 Depends-on:
+math
 fpieee
 
 configure.ac:
 gl_FUNC_ISNAND
+gl_MATH_MODULE_INDICATOR([isnand])
 
 Makefile.am:
 
 Include:
-#include "isnand.h"
+<math.h>
 
 Link:
 $(ISNAND_LIBM)

diff --git a/modules/isnanf b/modules/isnanf
index 429acfe36e1d92cc30208f102d67b13f56828c5e..4002751e1ec1e52a69c64a2d8e6541fe0ecbc466 100644 (file)
--- a/modules/isnanf
+++ b/modules/isnanf
@@ -2,7 +2,6 @@ Description:
 isnanf() function: test for NaN.
 
 Files:
-lib/isnanf.h
 lib/isnanf.c
 lib/isnan.c
 lib/float+.h
@@ -10,15 +9,17 @@ m4/exponentf.m4
 m4/isnanf.m4
 
 Depends-on:
+math
 fpieee
 
 configure.ac:
 gl_FUNC_ISNANF
+gl_MATH_MODULE_INDICATOR([isnanf])
 
 Makefile.am:
 
 Include:
-#include "isnanf.h"
+<math.h>
 
 Link:
 $(ISNANF_LIBM)

diff --git a/modules/isnanl b/modules/isnanl
index 66d84c13ce20257f2984b0f3b31369f8d159bd36..731ba76e56a98ce1ce821da376edd8a84cdfb25a 100644 (file)
--- a/modules/isnanl
+++ b/modules/isnanl
@@ -2,7 +2,6 @@ Description:
 isnanl() function: test for NaN.
 
 Files:
-lib/isnanl.h
 lib/isnanl.c
 lib/isnan.c
 lib/float+.h
@@ -10,16 +9,18 @@ m4/exponentl.m4
 m4/isnanl.m4
 
 Depends-on:
+math
 float
 fpieee
 
 configure.ac:
 gl_FUNC_ISNANL
+gl_MATH_MODULE_INDICATOR([isnanl])
 
 Makefile.am:
 
 Include:
-"isnanl.h"
+<math.h>
 
 Link:
 $(ISNANL_LIBM)

diff --git a/modules/math b/modules/math
index 3250a93c74bab1b0b49bb2d41e8fa91c844e62a8..82408c154e35f7d6011185149e39c956417bfb48 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -32,6 +32,9 @@ math.h: math.in.h
              -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
              -e 's|@''GNULIB_ISINF''@|$(GNULIB_ISINF)|g' \
              -e 's|@''GNULIB_ISNAN''@|$(GNULIB_ISNAN)|g' \
+             -e 's|@''GNULIB_ISNANF''@|$(GNULIB_ISNANF)|g' \
+             -e 's|@''GNULIB_ISNAND''@|$(GNULIB_ISNAND)|g' \
+             -e 's|@''GNULIB_ISNANL''@|$(GNULIB_ISNANL)|g' \
              -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
              -e 's|@''GNULIB_MATHL''@|$(GNULIB_MATHL)|g' \
              -e 's|@''GNULIB_ROUND''@|$(GNULIB_ROUND)|g' \
@@ -41,6 +44,9 @@ math.h: math.in.h
              -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
              -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
              -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|g' \
+             -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
+             -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \
+             -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \
              -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
              -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
              -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \

diff --git a/tests/test-isnand.c b/tests/test-isnand.c
index fc754d33dea7dd2154f2218b08286d547596c9ca..72af4ad0daf6090be6ea5045ac39ec4333118820 100644 (file)
--- a/tests/test-isnand.c
+++ b/tests/test-isnand.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "isnand.h"
+#include <math.h>
 
 #include "test-isnand.h"
 

diff --git a/tests/test-isnanf.c b/tests/test-isnanf.c
index a6065202388e47a2b8a95a83b073f5afb1854fff..02a2c32e2631afe5176c090d715057f0664e6221 100644 (file)
--- a/tests/test-isnanf.c
+++ b/tests/test-isnanf.c
@@ -16,6 +16,6 @@
 
 #include <config.h>
 
-#include "isnanf.h"
+#include <math.h>
 
 #include "test-isnanf.h"

diff --git a/tests/test-isnanl.c b/tests/test-isnanl.c
index 0a7f49613e5815ce3fa0116e5852f536349572e1..37551e1fdc301b86df28b5ceec6c44ea1d5fdd62 100644 (file)
--- a/tests/test-isnanl.c
+++ b/tests/test-isnanl.c
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -18,6 +18,6 @@
 
 #include <config.h>
 
-#include "isnanl.h"
+#include <math.h>
 
 #include "test-isnanl.h"