Index: src/include/storage/s_lock.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/storage/s_lock.h,v
retrieving revision 1.120
diff -c -c -r1.120 s_lock.h
*** src/include/storage/s_lock.h	23 Dec 2003 03:31:30 -0000	1.120
--- src/include/storage/s_lock.h	23 Dec 2003 03:49:44 -0000
***************
*** 72,77 ****
--- 72,78 ----
  
  #include "storage/pg_sema.h"
  
+ #ifdef HAVE_SPINLOCKS	/* skip spinlocks if requested */
  
  #if defined(__GNUC__) || defined(__ICC)
  /*************************************************************************
***************
*** 438,444 ****
   * Uses non-gcc inline assembly:
   */
  
! #if !defined(HAS_TEST_AND_SET)
  
  #if defined(USE_UNIVEL_CC)
  typedef unsigned char slock_t;
--- 439,445 ----
   * Uses non-gcc inline assembly:
   */
  
! #if !defined(HAS_TEST_AND_SET)	/* We didn't trigger above, let's try here */
  
  #if defined(USE_UNIVEL_CC)
  typedef unsigned char slock_t;
***************
*** 604,609 ****
--- 605,611 ----
  
  #endif	/* !defined(HAS_TEST_AND_SET */
  
+ #endif	/* HAVE_SPINLOCKS */
  
  
  #ifndef HAS_TEST_AND_SET