aboutsummaryrefslogtreecommitdiff
path: root/src/include/storage/lock.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/storage/lock.h')
-rw-r--r--src/include/storage/lock.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 37b7b053ee8..327f57cc7d1 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.30 1999/06/01 09:35:39 vadim Exp $
+ * $Id: lock.h,v 1.31 1999/07/15 20:32:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include <utils/array.h>
extern SPINLOCK LockMgrLock;
-typedef int MASK;
+typedef int LOCKMASK;
#define INIT_TABLE_SIZE 100
#define MAX_TABLE_SIZE 1000
@@ -41,7 +41,7 @@ typedef int MASK;
typedef int LOCKMODE;
typedef int LOCKMETHOD;
-/* MAX_LOCKMODES cannot be larger than the bits in MASK */
+/* MAX_LOCKMODES cannot be larger than the bits in LOCKMASK */
#define MAX_LOCKMODES 8
/*
@@ -241,7 +241,7 @@ extern SPINLOCK LockMgrLock;
*/
extern void InitLocks(void);
extern void LockDisable(int status);
-extern LOCKMETHOD LockMethodTableInit(char *tabName, MASK *conflictsP,
+extern LOCKMETHOD LockMethodTableInit(char *tabName, LOCKMASK *conflictsP,
int *prioP, int numModes);
extern LOCKMETHOD LockMethodTableRename(LOCKMETHOD lockmethod);
extern bool LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,