Convert NEED_{RINT,CBRT,ISINF} to HAVE_* in prepration for configure...

diff --git a/src/backend/port/win32/nt.h b/src/backend/port/win32/nt.h
index 6dc54ae..bd83150 100644 (file)
--- a/src/backend/port/win32/nt.h
+++ b/src/backend/port/win32/nt.h
@@ -26,7 +26,7 @@ struct sembuf
 };
 
 #define USE_POSIX_TIME
-#define NEED_RINT
+#undef HAVE_RINT
 
 #define MAXHOSTNAMELEN 12      /* where is the official definition of this? */
 #define MAXPATHLEN _MAX_PATH   /* in winsock.h */

diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 39824b2..6dce964 100644 (file)
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.9 1997/01/18 17:36:02 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.10 1997/01/24 18:17:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,28 +68,28 @@
 extern double  atof(const char *p);
 #endif
 
-#ifdef NEED_CBRT
+#ifndef HAVE_CBRT
 # define cbrt my_cbrt
   static double   cbrt(double x);
-#else /* NEED_CBRT */
-# if !defined(next)
+#else 
+# if !defined(nextstep)
    extern double   cbrt(double x);
 # endif
-#endif /* NEED_CBRT */
-
-#ifdef NEED_RINT
-#define rint my_rint
-static double   rint(double x);
-#else /* NEED_RINT */
-extern double   rint(double x);
-#endif /* NEED_RINT */
-
-#ifdef NEED_ISINF
-#define isinf my_isinf
-static int     isinf(double x);
-#else /* NEED_ISINF */
-extern int     isinf(double x);
-#endif /* NEED_ISINF */
+#endif 
+
+#ifndef HAVE_RINT
+# define rint my_rint
+  static double   rint(double x);
+#else 
+  extern double   rint(double x);
+#endif 
+
+#ifndef HAVE_ISINF
+# define isinf my_isinf
+  static int   isinf(double x);
+#else 
+  extern int   isinf(double x);
+#endif 
 
 #endif 
 /* ========== USER I/O ROUTINES ========== */
@@ -1125,7 +1125,7 @@ long float84ge(float64 arg1, float32 arg2)
 
 /* From "fdlibm" @ netlib.att.com */
 
-#ifdef NEED_RINT
+#ifndef HAVE_RINT
 
 /* @(#)s_rint.c 5.1 93/09/24 */
 /*
@@ -1211,9 +1211,9 @@ static double rint(double x)
     return w-TWO52[sx];
 }
 
-#endif /* NEED_RINT */
+#endif /* !HAVE_RINT */
 
-#ifdef NEED_CBRT
+#ifndef HAVE_CBRT
 
 static
     double
@@ -1226,9 +1226,9 @@ double x;
     return(isneg ? -tmpres : tmpres);
 }
 
-#endif /* NEED_CBRT */
+#endif /* !HAVE_CBRT */
 
-#ifdef NEED_ISINF
+#ifndef HAVE_ISINF
 
 #if defined(aix)
 #ifdef CLASS_CONFLICT
@@ -1318,4 +1318,4 @@ double d;
 }
 #endif /* irix5 */
 
-#endif /* NEED_ISINF */
+#endif /* !HAVE_ISINF */

diff --git a/src/include/config.h b/src/include/config.h
index 4ad1483..d54193a 100644 (file)
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -16,7 +16,7 @@
 #  undef HAVE_TERMIOS_H
 #  define CLASS_CONFLICT 
 #  define DISABLE_XOPEN_NLS 
-#  define NEED_ISINF
+#  define HAVE_ISINF
 #  define NEED_UNION_SEMUN 
 #  define NEED_SYS_SELECT_H
 #  define HAVE_TZSET
@@ -29,7 +29,7 @@
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
 #  define DISABLE_XOPEN_NLS 
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define HAS_LONG_LONG
 #  define NEED_UNION_SEMUN 
 #  define HAS_TEST_AND_SET
@@ -40,7 +40,7 @@
 #if defined(BSD44_derived)
 #  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME
-#  define NEED_CBRT
+#  define HAVE_CBRT
 #  define NEED_I386_TAS_ASM
 #  define HAS_TEST_AND_SET
 #  if defined(__mips__)
@@ -61,7 +61,7 @@
 #  endif
 #  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME
-#  define NEED_CBRT
+#  define HAVE_CBRT
 #  define HAS_TEST_AND_SET
    typedef unsigned char slock_t;
 #endif
@@ -77,8 +77,8 @@
 #  define JMP_BUF
 #  define USE_POSIX_TIME
 #  define HAVE_TZSET
-#  define NEED_CBRT
-#  define NEED_RINT
+#  define HAVE_CBRT
+#  define HAVE_RINT
 #  define NEED_UNION_SEMUN 
 #  define HAS_TEST_AND_SET
    typedef struct { int sem[4]; } slock_t;
@@ -88,7 +88,7 @@
 #  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define HAVE_TZSET
@@ -101,7 +101,7 @@
 #if defined(irix5)
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define NO_EMPTY_STMTS
 #  define NO_VFORK
 #  define HAVE_TZSET
@@ -121,7 +121,7 @@
 #  define JMP_BUF
 #  define USE_POSIX_TIME
 #  define HAVE_TZSET
-#  define NEED_CBRT
+#  define HAVE_CBRT
 #  define NEED_I386_TAS_ASM
 #  define HAS_TEST_AND_SET
    typedef unsigned char slock_t;
@@ -160,7 +160,7 @@
 #  define HAVE_LIMITS_H
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define USE_POSIX_TIME
@@ -179,7 +179,7 @@ typedef unsigned char slock_t;
 #if defined(svr4) 
 #  define USE_POSIX_TIME 
 #  define USE_POSIX_SIGNALS
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define NEED_RUSAGE 
 #  define NO_EMPTY_STMTS
 #  define HAVE_TZSET
@@ -195,15 +195,15 @@ typedef unsigned char slock_t;
 #  define NOFILE       100
 #  define NEED_UNION_SEMUN
 #  define HAVE_TZSET
-#  define NEED_CBRT
-#  define NEED_ISINF
+#  define HAVE_CBRT
+#  define HAVE_ISINF
 #  ifndef MAXPATHLEN
 #  define MAXPATHLEN    250
 #  endif
 #endif /* WIN32 */
 
 #if defined(ultrix4)
-#  define NEED_ISINF 
+#  define HAVE_ISINF 
 #  define USE_POSIX_TIME
 #  define NEED_UNION_SEMUN 
 #  define NEED_STRDUP