diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/port/irix5.h | 3 | ||||
-rw-r--r-- | src/include/storage/s_lock.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/include/port/irix5.h b/src/include/port/irix5.h index 83c7837584f..f8f180d7dc2 100644 --- a/src/include/port/irix5.h +++ b/src/include/port/irix5.h @@ -3,5 +3,4 @@ #define NO_EMPTY_STMTS #define SYSV_DIRENT #define HAS_TEST_AND_SET -#include <abi_mutex.h> -typedef abilock_t slock_t; +typedef unsigned long slock_t; diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index b094ed8fb8d..bc8fb9402cd 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.52 1998/10/02 15:23:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.53 1998/10/02 15:38:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -261,8 +261,11 @@ tas(slock_t *s_lock) #if defined(__sgi) /* * SGI IRIX 5 - * slock_t is defined as a struct abilock_t, which has a single unsigned long - * member. + * slock_t is defined as a unsigned long. We use the standard SGI + * mutex API. + * + * The following comment is left for historical reasons, but is probably + * not a good idea since the mutex ABI is supported. * * This stuff may be supplemented in the future with Masato Kataoka's MIPS-II * assembly from his NECEWS SVR4 port, but we probably ought to retain this |