3 files changed, 8 insertions, 8 deletions
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index 1a7f74b8b98..b2a9cd1cb0a 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -13,7 +13,7 @@
 #if defined(PPC)
 typedef unsigned int slock_t;
 
-#elif defined(__alpha__)
+#elif defined(__alpha)
 typedef long int slock_t;
 
 #else
@@ -42,6 +42,6 @@ typedef unsigned char slock_t;
 #undef NEED_I386_TAS_ASM
 #endif
 
-#if defined(__alpha__)
+#if defined(__alpha)
 #undef NEED_I386_TAS_ASM
 #endif
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 89612c1b718..e7b3104a650 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.28 1998/03/01 04:47:24 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.29 1998/04/27 14:45:33 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@
  * (see storage/ipc.h).
  */
 
-#if (defined(__alpha__) || defined(__alpha)) && !defined(linux)
+#if defined(__alpha) && !defined(linux)
 
 #define S_LOCK(lock)	do \
 						{ \
@@ -340,7 +340,7 @@ again:
 #endif							/* NEED_I386_TAS_ASM */
 
 
-#if defined(__alpha__) && defined(linux)
+#if defined(__alpha) && defined(linux)
 
 void		S_LOCK(slock_t *lock);
 
@@ -348,7 +348,7 @@ void		S_LOCK(slock_t *lock);
 
 #define S_INIT_LOCK(lock)	S_UNLOCK(lock)
 
-#endif							/* defined(__alpha__) && defined(linux) */
+#endif							/* defined(__alpha) && defined(linux) */
 
 #if defined(linux) && defined(sparc)
 
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index aaec736914e..71a2581676c 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.15 1998/04/12 02:58:22 scrappy Exp $
+ * $Id: memutils.h,v 1.16 1998/04/27 14:46:17 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)
+#elif defined (__alpha)
 
  /*
   * even though "long alignment" should really be on 8-byte boundaries for