diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index f44b80e3e275f4f35d805e6d24209ca004769d9f..aa44385fed50522e64af0716591dcfe883207ce6 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.6 1998/05/04 16:58:38 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.7 1998/05/04 23:49:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -92,7 +92,7 @@ s_lock_stuck(slock_t *lock, char *file, int line)
  */
 
 
-#if defined(__alpha__)
+#if defined(__alpha)
 int
 tas(slock_t *lock)
 {
@@ -114,7 +114,7 @@ tas(slock_t *lock)
 
 	return (_res != 0);
 }
-#endif /* __alpha__ */
+#endif /* __alpha */
 
 
 
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index e18e6fbaa8d3215242d26be7f4cc67fa365168c4..4ac6684ee79fc299cfd0261ef31f20af8b1205f8 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -12,7 +12,7 @@
 #if defined(PPC)
 typedef unsigned int slock_t;
 
-#elif defined(__alpha__)
+#elif defined(__alpha)
 typedef long int slock_t;
 
 #else /* i386 probably */
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index ac8e55f7b8d14b81d6af70219e0dba4215fe9924..bd06020502841a7f4c1906ec366a6458c1a5009e 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.32 1998/05/04 16:58:59 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.33 1998/05/04 23:49:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,11 +74,11 @@
  * All Linux
  */
 
-#if defined(__alpha__)
+#if defined(__alpha)
 
 #define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; }
 
-#endif /* __alpha__ */
+#endif /* __alpha */
 
 
 
@@ -129,7 +129,7 @@
 
 
 
-#if (defined(__alpha__)
+#if (defined(__alpha)
 /*
  * OSF/1 (Alpha AXP)
  *
@@ -144,7 +144,7 @@
 
 #define S_LOCK_FREE(lock)	(!(lock)->msem_state)
 
-#endif /* __alpha__ */
+#endif /* __alpha */