Move all the isinf() stuff from float.c to isinf.c, and build it according to

configure vs port specific #ifdef's...

src/backend/parser/scan.c

 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.10 1998/01/27 03:25:07 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.11 1998/02/02 00:03:39 scrappy Exp $
  */
 
 #define FLEX_SCANNER
@@ -539,7 +539,7 @@ char *yytext;
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.10 1998/01/27 03:25:07 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.11 1998/02/02 00:03:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/port/isinf.c

-/* $Id: isinf.c,v 1.1 1998/01/15 20:54:37 scrappy Exp $ */
+/* $Id: isinf.c,v 1.2 1998/02/02 00:03:46 scrappy Exp $ */
 
-#include <ieeefp.h>
 #include <math.h>  
-
 #include "config.h"
 
+#if HAVE_FPCLASS
+#  if HAVE_IEEEFP_H
+#    include <ieeefp.h>
+#  endif
+int
+isinf(double d)
+{
+	fpclass_t       type = fpclass(d);
+
+	switch (type)
+	{
+		case FP_SNAN:
+		case FP_QNAN:
+		case FP_NINF:
+		case FP_PINF:
+			return (1);
+		default:
+			break;
+	}
+	return (0);
+}
+#endif
 
+#if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D)
+#  if HAVE_FP_CLASS_H
+#    include <fp_class.h>
+#  endif
+int      
+isinf(x)         
+double          x;
+{               
+#if HAVE_FP_CLASS
+	int	fpclass = fp_class(x);
+#else
+	int	fpclass = fp_class_d(x);
+#endif
+ 
+	if (fpclass == FP_POS_INF)   
+		return (1); 
+	if (fpclass == FP_NEG_INF)
+		return (-1);
+	return (0);
+}
+#endif
+
+#if defined(HAVE_CLASS)
 int
 isinf(double x)
 {
-	if((fpclass(x) == FP_PINF) || (fpclass(x) == FP_NINF)) return 1;
-	else return 0;
-}
+	int	fpclass = class(x);
 
+	if (fpclass == FP_PLUS_INF)
+		return (1);
+	if (fpclass == FP_MINUS_INF)
+		return (-1);
+	return (0);
+}
+#endif

src/backend/utils/adt/float.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.27 1998/01/13 19:28:32 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.28 1998/02/02 00:03:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1507,130 +1507,3 @@ double		x;
 }
 
 #endif							/* !HAVE_CBRT */
-
-#ifndef HAVE_ISINF
-
-#if defined(aix)
-
-#ifdef CLASS_CONFLICT
-/* we want the math symbol */
-#undef class
-#endif							/* CLASS_CONFICT */
-
-/* The gcc doesn't support isinf() (without libgcc?) so we 
- * have to do it - Gerhard Reitofer 
- */
-#ifdef __GNUC__
-
-static int
-isinf(double x)
-{
-    if (x == HUGE_VAL)
-        return(1);
-    if (x == -HUGE_VAL)
-        return(-1);
-    return(0);
-}
-
-#else /* __GNUC__ */
-
-static int
-isinf(double x)
-{
-	int			fpclass = class(x);
-
-	if (fpclass == FP_PLUS_INF)
-		return (1);
-	if (fpclass == FP_MINUS_INF)
-		return (-1);
-	return (0);
-}
-
-#endif /* __GNUC__ */
-
-#endif							/* aix */
-
-#if defined(ultrix4)
-#include <fp_class.h>
-static int
-isinf(x)
-double		x;
-{
-	int			fpclass = fp_class_d(x);
-
-	if (fpclass == FP_POS_INF)
-		return (1);
-	if (fpclass == FP_NEG_INF)
-		return (-1);
-	return (0);
-}
-
-#endif							/* ultrix4 */
-
-#if defined(alpha)
-#include <fp_class.h>
-static int
-isinf(x)
-double		x;
-{
-	int			fpclass = fp_class(x);
-
-	if (fpclass == FP_POS_INF)
-		return (1);
-	if (fpclass == FP_NEG_INF)
-		return (-1);
-	return (0);
-}
-
-#endif							/* alpha */
-
-#if defined(sparc_solaris) || defined(i386_solaris)  || defined(svr4) || \
-	defined(sco)
-#include <ieeefp.h>
-static int
-isinf(d)
-double		d;
-{
-	fpclass_t	type = fpclass(d);
-
-	switch (type)
-	{
-		case FP_SNAN:
-		case FP_QNAN:
-		case FP_NINF:
-		case FP_PINF:
-			return (1);
-		default:
-			break;
-	}
-
-	return (0);
-}
-
-#endif							/* sparc_solaris */
-
-#if defined(irix5)
-#include <ieeefp.h>
-static int
-isinf(d)
-double		d;
-{
-	fpclass_t	type = fpclass(d);
-
-	switch (type)
-	{
-		case FP_SNAN:
-		case FP_QNAN:
-		case FP_NINF:
-		case FP_PINF:
-			return (1);
-		default:
-			break;
-	}
-
-	return (0);
-}
-
-#endif							/* irix5 */
-
-#endif							/* !HAVE_ISINF */

src/configure.in

@@ -433,7 +433,7 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
 AC_CHECK_HEADERS(sys/resource.h netdb.h arpa/inet.h)
 AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
-AC_CHECK_HEADERS(readline/history.h)
+AC_CHECK_HEADERS(readline/history.h ieeefp.h fp_class.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -465,7 +465,8 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(tzset vfork memmove sigsetjmp kill sysconf)
+AC_CHECK_FUNCS(tzset vfork memmove sigsetjmp kill sysconf fpclass)
+AC_CHECK_FUNCS(fp_class fp_class_d class)
 AC_CHECK_FUNCS(sigprocmask waitpid setsid fcvt)
 AC_CHECK_FUNC(isinf, 
               AC_DEFINE(HAVE_ISINF), 

src/include/config.h.in

@@ -14,6 +14,12 @@
  * The following is set using configure.  
  */
 
+/* Set to 1 if you have <fp_class.h> */
+#undef HAVE_FP_CLASS_H
+
+/* Set to 1 if you have <ieeefp.h> */
+#undef HAVE_IEEEFP_H
+
 /* Set to 1 if you have <arpa/inet.h> */
 #undef HAVE_ARPA_INET_H
 
@@ -53,6 +59,18 @@
 /* Set to 1 if you have <dld.h> */
 #undef HAVE_DLD_H
 
+/* Set to 1 if you have fp_class() */
+#undef HAVE_FP_CLASS
+
+/* Set to 1 if you have class() */
+#undef HAVE_CLASS
+
+/* Set to 1 if you have fp_class_d() */
+#undef HAVE_FP_CLASS_D
+
+/* Set to 1 if you have fpclass() */
+#undef HAVE_FPCLASS
+
 /* Set to 1 if you have isinf() */
 #undef HAVE_ISINF
 #ifndef HAVE_ISINF