diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index 1916b102acf1faaef2b7336afbe3a39edde01ffb..2196444299f8af0570db7d721bf47ca3b10c7845 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.10 1998/01/07 21:05:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.11 1998/01/23 19:53:40 scrappy Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -31,10 +31,10 @@ static bool MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level); + PG_LOCK_LEVEL level); static bool MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level); + PG_LOCK_LEVEL level); /* * INTENT indicates to higher level that a lower level lock has been @@ -201,7 +201,7 @@ static bool MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level) + PG_LOCK_LEVEL level) { LOCKT locks[N_LEVELS]; int i, @@ -361,7 +361,7 @@ static bool MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, - LOCK_LEVEL level) + PG_LOCK_LEVEL level) { LOCKT locks[N_LEVELS]; int i, diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h index 3d4aa1edbb9d5cc1edb5c77dfa05dd196fa0e52e..0f8218e175544aa498558516b1c5f37e8b0fafa5 100644 --- a/src/include/storage/multilev.h +++ b/src/include/storage/multilev.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: multilev.h,v 1.5 1997/09/08 02:39:05 momjian Exp $ + * $Id: multilev.h,v 1.6 1998/01/23 19:53:44 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ #define RELN_LEVEL 0 #define PAGE_LEVEL 1 #define TUPLE_LEVEL 2 -typedef int LOCK_LEVEL; +typedef int PG_LOCK_LEVEL; /* multi.c */