diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 532e0dc30b98ce9d9de51eb911b3e78f17fc3259..6f27e14c398fad0deef88e2fe487270482513178 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.29 1998/02/26 04:37:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.30 1998/04/12 02:58:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,7 +132,7 @@ extern int	isinf(double x);
  * until the distributions are updated.
  *								--djm 12/16/96
  */
-#if defined(linuxalpha) && !defined(UNSAFE_FLOATS)
+#if ( defined(linux) && defined(alpha) ) && !defined(UNSAFE_FLOATS)
 #define UNSAFE_FLOATS
 #endif
 
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index fdfde10ffe8aca12b8b386b8cf8b898cbe99797b..aaec736914e21ffd696e3844a534f4437566113a 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.14 1998/02/26 04:44:08 momjian Exp $
+ * $Id: memutils.h,v 1.15 1998/04/12 02:58:22 scrappy Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -67,7 +67,7 @@ s...)
  */
 #if defined(sun) && ! defined(sparc)
 #define LONGALIGN(LEN)	SHORTALIGN(LEN)
-#elif defined (alpha) || defined(linuxalpha)
+#elif defined (alpha)
 
  /*
   * even though "long alignment" should really be on 8-byte boundaries for