diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 176a2d5d039ab7e2d29b9e3f5dc756e00da3e018..8434e8d6c8f34cb049f00dcd95cc3d3bf799b3fb 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.17 2003/11/29 19:51:57 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.18 2003/12/22 23:39:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -208,7 +208,7 @@ tas_dummy()						/* really means: extern int tas(slock_t
 
 
 
-#if defined(NEED_SPARC_TAS_ASM)
+#if defined(__sparc__) || defined(__sparc)
 /*
  * sparc machines not using gcc
  */
@@ -227,7 +227,7 @@ tas_dummy()						/* really means: extern int tas(slock_t
 	asm("retl");
 	asm("nop");
 }
-#endif   /* NEED_SPARC_TAS_ASM */
+#endif   /* __sparc || __sparc__ */
 
 
 
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index c1ec729d81f6e9851c7ad03c1bb7e31c7dcaaa30..467c74382c685a2087a57b3c8d2815e6c89e6a73 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -6,7 +6,6 @@ typedef unsigned char slock_t;
 typedef unsigned int slock_t;
 #endif
 #if defined(__sparc__)
-#define NEED_SPARC_TAS_ASM
 typedef unsigned char slock_t;
 #endif
 
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index 386584e9a31ea16630df5a0dc93ee0bfb2b67aff..5c5b77ede964d59d4f3901934e652edcfdb3978a 100644
--- a/src/include/port/freebsd.h
+++ b/src/include/port/freebsd.h
@@ -10,7 +10,6 @@ typedef unsigned int slock_t;
 #endif
 
 #if defined(__sparc__)
-#define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h
index 386584e9a31ea16630df5a0dc93ee0bfb2b67aff..5c5b77ede964d59d4f3901934e652edcfdb3978a 100644
--- a/src/include/port/netbsd.h
+++ b/src/include/port/netbsd.h
@@ -10,7 +10,6 @@ typedef unsigned int slock_t;
 #endif
 
 #if defined(__sparc__)
-#define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif
diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h
index 386584e9a31ea16630df5a0dc93ee0bfb2b67aff..5c5b77ede964d59d4f3901934e652edcfdb3978a 100644
--- a/src/include/port/openbsd.h
+++ b/src/include/port/openbsd.h
@@ -10,7 +10,6 @@ typedef unsigned int slock_t;
 #endif
 
 #if defined(__sparc__)
-#define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 #endif