diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/storage/lmgr/s_lock.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index f57dd9a439e..d6c1a657875 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.37 2005/08/25 17:17:09 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.38 2005/08/26 14:47:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -135,7 +135,12 @@ s_lock(volatile slock_t *lock, const char *file, int line) */ -#if defined(__m68k__) +/* + * Note: all the if-tests here probably ought to be testing gcc version + * rather than platform, but I don't have adequate info to know what to + * write. Ideally we'd flush all this in favor of the inline version. + */ +#if defined(__m68k__) && !defined(__linux__) /* really means: extern int tas(slock_t* **lock); */ static void tas_dummy() @@ -169,7 +174,7 @@ _success: \n\ #endif /* __NetBSD__ && __ELF__ */ ); } -#endif /* __m68k__ */ +#endif /* __m68k__ && !__linux__ */ #else /* not __GNUC__ */ |