From f9322c66d3cc06b011c087e6016c461d0e78648e Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 4 May 1998 23:49:17 +0000 Subject: [PATCH] Missed the __alpha__ to __alpha change... From: David Gould --- src/backend/storage/buffer/s_lock.c | 6 +++--- src/include/port/linux.h | 2 +- src/include/storage/s_lock.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c index f44b80e3e2..aa44385fed 100644 --- a/src/backend/storage/buffer/s_lock.c +++ b/src/backend/storage/buffer/s_lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.6 1998/05/04 16:58:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.7 1998/05/04 23:49:09 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -92,7 +92,7 @@ s_lock_stuck(slock_t *lock, char *file, int line) */ -#if defined(__alpha__) +#if defined(__alpha) int tas(slock_t *lock) { @@ -114,7 +114,7 @@ tas(slock_t *lock) return (_res != 0); } -#endif /* __alpha__ */ +#endif /* __alpha */ diff --git a/src/include/port/linux.h b/src/include/port/linux.h index e18e6fbaa8..4ac6684ee7 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -12,7 +12,7 @@ #if defined(PPC) typedef unsigned int slock_t; -#elif defined(__alpha__) +#elif defined(__alpha) typedef long int slock_t; #else /* i386 probably */ diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index ac8e55f7b8..bd06020502 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.32 1998/05/04 16:58:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.33 1998/05/04 23:49:17 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -74,11 +74,11 @@ * All Linux */ -#if defined(__alpha__) +#if defined(__alpha) #define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; } -#endif /* __alpha__ */ +#endif /* __alpha */ @@ -129,7 +129,7 @@ -#if (defined(__alpha__) +#if (defined(__alpha) /* * OSF/1 (Alpha AXP) * @@ -144,7 +144,7 @@ #define S_LOCK_FREE(lock) (!(lock)->msem_state) -#endif /* __alpha__ */ +#endif /* __alpha */ -- 2.11.0