re PR libfortran/15292 (libgfortran depends on c99 functionality round and roundf)

2004-06-14  Bud Davis  <bdavis9659@comcast.net>

        PR gfortran/15292
        * intrinsics/c99_functions.c: Use fpclassify if it exists.

From-SVN: r83116

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 05024399d541d465ba390000ff81b0664a2ba5b2..f0e7d8d7483eaf0de8947295d3afdcb3ccc7490c 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-14  Bud Davis  <bdavis9659@comcast.net>
+
+       PR gfortran/15292
+       * intrinsics/c99_functions.c: Use fpclassify if it exists.
+
 2004-06-13  Paul Brook  <paul@codesourcery.com>
 
        * Makefile.am (gfor_helper_src): Add runtime/normalize.f90.

diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c
index 932838780b83b3da8e47cd520d29c1d90b1a456d..69b6c3e2e96f592e123fce710efe5640fcbbfaed 100644 (file)
--- a/libgfortran/intrinsics/c99_functions.c
+++ b/libgfortran/intrinsics/c99_functions.c
@@ -24,6 +24,8 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
+/* Note that if HAVE_FPCLASSIFY is not defined, then NaN is not handled */
+
 /* Algorithm by Steven G. Kargl.  */
 
 #ifndef HAVE_ROUND
@@ -34,11 +36,12 @@ double
 round(double x)
 {
    double t;
+#ifdef HAVE_FPCLASSIFY
    int i;
-
    i = fpclassify(x);
    if (i == FP_INFINITE || i == FP_NAN)
      return (x);
+#endif
 
    if (x >= 0.0) 
     {
@@ -65,11 +68,13 @@ float
 roundf(float x)
 {
    float t;
+#ifdef HAVE_FPCLASSIFY
    int i;
 
    i = fpclassify(x);
    if (i == FP_INFINITE || i == FP_NAN)
      return (x);
+#endif
 
    if (x >= 0.0) 
     {