aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-12-23 03:52:10 +0000
committerBruce Momjian <bruce@momjian.us>2003-12-23 03:52:10 +0000
commitcaf6e9d2dd072299fa7779446f0dcc31e1f80c2d (patch)
tree3ff74a942168e2d1b4f54182f639e0debf2dd0ff /src
parent69f2e9b0fc46e50525990fbc9ea049e2c91840bf (diff)
downloadpostgresql-caf6e9d2dd072299fa7779446f0dcc31e1f80c2d.tar.gz
postgresql-caf6e9d2dd072299fa7779446f0dcc31e1f80c2d.zip
Have configure --without-spinlocks actually not use spinlock code, even
if supported by the cpu.
Diffstat (limited to 'src')
-rw-r--r--src/include/storage/s_lock.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 52bbfbebab9..1f4791ced1c 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -63,7 +63,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.120 2003/12/23 03:31:30 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.121 2003/12/23 03:52:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -72,6 +72,7 @@
#include "storage/pg_sema.h"
+#ifdef HAVE_SPINLOCKS /* skip spinlocks if requested */
#if defined(__GNUC__) || defined(__ICC)
/*************************************************************************
@@ -438,7 +439,7 @@ typedef unsigned char slock_t;
* Uses non-gcc inline assembly:
*/
-#if !defined(HAS_TEST_AND_SET)
+#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,6 +605,7 @@ typedef unsigned char slock_t;
#endif /* !defined(HAS_TEST_AND_SET */
+#endif /* HAVE_SPINLOCKS */
#ifndef HAS_TEST_AND_SET