diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/optimizer/geqo_random.h | 6 | ||||
| -rw-r--r-- | src/include/storage/lock.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index ea5ec008b6a..450f9695439 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_random.h,v 1.4 1999/02/13 23:21:48 momjian Exp $ + * $Id: geqo_random.h,v 1.5 1999/07/15 20:32:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,9 +25,9 @@ #include <math.h> -#define MASK 2147483647 +#define GEQOMASK 2147483647 -#define geqo_rand() ((double)random()/MASK) +#define geqo_rand() ((double)random()/GEQOMASK) /* geqo_randint returns integer value between lower and upper inclusive */ 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, |