diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-07-15 20:32:30 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-07-15 20:32:30 +0000 |
| commit | 40a89e08b2d7bb592d940e56f696df4a6459e7a3 (patch) | |
| tree | 161f97bb8733ed8eca262b9478edebc07caa1e33 /src/backend/storage | |
| parent | fb38a5d8cfd05ae7890f6b319aa5983ccf12f21b (diff) | |
| download | postgresql-40a89e08b2d7bb592d940e56f696df4a6459e7a3.tar.gz postgresql-40a89e08b2d7bb592d940e56f696df4a6459e7a3.zip | |
Cleanups.
Diffstat (limited to 'src/backend/storage')
| -rw-r--r-- | src/backend/storage/lmgr/lmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 10 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/multi.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 2dce65a108a..cf7a1c86825 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.28 1999/07/15 15:19:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.29 1999/07/15 20:32:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,7 @@ extern Oid MyDatabaseId; -static MASK LockConflicts[] = { +static LOCKMASK LockConflicts[] = { (int) NULL, /* AccessShareLock */ diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index ba44c44de0d..74845dbcf87 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.56 1999/07/15 15:19:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.57 1999/07/15 20:32:27 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -162,8 +162,8 @@ SPINLOCK LockMgrLock; /* in Shmem or created in /* This is to simplify/speed up some bit arithmetic */ -static MASK BITS_OFF[MAX_LOCKMODES]; -static MASK BITS_ON[MAX_LOCKMODES]; +static LOCKMASK BITS_OFF[MAX_LOCKMODES]; +static LOCKMASK BITS_ON[MAX_LOCKMODES]; /* ----------------- * XXX Want to move this to this file @@ -231,7 +231,7 @@ LockDisable(int status) */ static void LockMethodInit(LOCKMETHODTABLE *lockMethodTable, - MASK *conflictsP, + LOCKMASK *conflictsP, int *prioP, int numModes) { @@ -258,7 +258,7 @@ LockMethodInit(LOCKMETHODTABLE *lockMethodTable, */ LOCKMETHOD LockMethodTableInit(char *tabName, - MASK *conflictsP, + LOCKMASK *conflictsP, int *prioP, int numModes) { diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index e60ba613ee8..12c7d70e82b 100644 --- a/src/backend/storage/lmgr/multi.c +++ b/src/backend/storage/lmgr/multi.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.29 1999/05/25 16:11:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.30 1999/07/15 20:32:27 momjian Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -41,7 +41,7 @@ static bool MultiRelease(LOCKMETHOD lockmethod, LOCKTAG *tag, * WRITE conflict between the tuple's intent lock and the relation's * write lock. */ -static MASK MultiConflicts[] = { +static LOCKMASK MultiConflicts[] = { (int) NULL, /* All reads and writes at any level conflict with a write lock */ (1 << WRITE_LOCK) | (1 << WRITE_INTENT) | (1 << READ_LOCK) | (1 << READ_INTENT), |