3 files changed, 23 insertions, 23 deletions
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 1ff3346092..6affe0691e 100644
--- 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.5 1996/10/26 05:03:24 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1229,7 +1229,7 @@ double x;
 
 #ifdef NEED_ISINF
 
-#if defined(PORTNAME_aix)
+#if defined(aix)
 #ifdef CLASS_CONFLICT
 /* we want the math symbol */
 #undef class
@@ -1245,9 +1245,9 @@ static int isinf(x)
 	return(-1);
     return(0);
 }
-#endif /* PORTNAME_aix */
+#endif /* aix */
 
-#if defined(PORTNAME_ultrix4)
+#if defined(ultrix4)
 #include <fp_class.h>
 static int isinf(x)
      double x;
@@ -1259,9 +1259,9 @@ static int isinf(x)
 	return(-1);
     return(0);
 }
-#endif /* PORTNAME_ultrix4 */
+#endif /* ultrix4 */
 
-#if defined(PORTNAME_alpha)
+#if defined(alpha)
 #include <fp_class.h>
 static int isinf(x)
      double x;
@@ -1273,9 +1273,9 @@ static int isinf(x)
 	return(-1);
     return(0);
 }
-#endif /* PORTNAME_alpha */
+#endif /* alpha */
 
-#if defined(sparc_solaris) || defined(i386_solaris)  || defined(PORTNAME_svr4)
+#if defined(sparc_solaris) || defined(i386_solaris)  || defined(svr4)
 #include <ieeefp.h>
 static int
     isinf(d)
@@ -1294,9 +1294,9 @@ double d;
     
     return (0);
 }
-#endif /* PORTNAME_sparc_solaris */
+#endif /* sparc_solaris */
 
-#if defined(PORTNAME_irix5)
+#if defined(irix5)
 #include <ieeefp.h>
 static int
     isinf(d)
@@ -1315,6 +1315,6 @@ double d;
     
     return (0);
 }
-#endif /* PORTNAME_irix5 */
+#endif /* irix5 */
 
 #endif /* NEED_ISINF */
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 97c80fb4f4..2315fb3451 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.3 1996/07/22 21:56:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.4 1996/10/31 10:23:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,12 +17,12 @@
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
 
-#if !defined(PORTNAME_aix) && \
-    !defined(PORTNAME_BSD44_derived) && \
-    !defined(PORTNAME_bsdi) && \
-    !defined(PORTNAME_bsdi_2_1) && \
-    !defined(PORTNAME_irix5) && \
-    !defined(PORTNAME_linux)
+#if !defined(aix) && \
+    !defined(BSD44_derived) && \
+    !defined(bsdi) && \
+    !defined(bsdi_2_1) && \
+    !defined(irix5) && \
+    !defined(linux)
 extern int random();
 extern int srandom(unsigned);
 #endif
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 823212afa0..b331d45426 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.3 1996/07/22 21:56:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,9 +132,9 @@ ltoa(int32 l, char *a)
 int
 ftoa(double value, char *ascii, int width, int prec1, char format)
 {
-#if defined(PORTNAME_BSD44_derived) || \
-    defined(PORTNAME_bsdi) || \
-    defined(PORTNAME_bsdi_2_1)
+#if defined(BSD44_derived) || \
+    defined(bsdi) || \
+    defined(bsdi_2_1)
 	char	out[256];
 	char	fmt[256];
 	int	ret;
@@ -281,7 +281,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
     *a = 0;
     avail = a - ascii;
     return (avail);
-#endif /* !PORTNAME_BSD44_derived */
+#endif /* !BSD44_derived */
 }
 
 /*