diff options
Diffstat (limited to 'src/include/storage/s_lock.h')
| -rw-r--r-- | src/include/storage/s_lock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 579db815a4e..0124b365a01 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -66,7 +66,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.135 2005/08/25 17:17:10 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.136 2005/08/26 14:47:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -191,7 +191,7 @@ tas(volatile slock_t *lock) return (int) ret; } -#else +#else /* __INTEL_COMPILER */ static __inline__ int tas(volatile slock_t *lock) @@ -203,7 +203,7 @@ tas(volatile slock_t *lock) return ret; } -#endif +#endif /* __INTEL_COMPILER */ #endif /* __ia64__ || __ia64 */ @@ -328,7 +328,7 @@ do \ #endif /* powerpc */ -#if defined(__mc68000__) && defined(__linux__) +#if (defined(__mc68000__) || defined(__m68k__)) && defined(__linux__) #define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -350,7 +350,7 @@ tas(volatile slock_t *lock) return rv; } -#endif /* defined(__mc68000__) && defined(__linux__) */ +#endif /* (__mc68000__ || __m68k__) && __linux__ */ #if defined(__vax__) @@ -491,7 +491,7 @@ tas(volatile slock_t *lock) /* These live in s_lock.c, but only for gcc */ -#if defined(__m68k__) +#if defined(__m68k__) && !defined(__linux__) #define HAS_TEST_AND_SET typedef unsigned char slock_t; |