Commit 1de8926b authored by Marc G. Fournier's avatar Marc G. Fournier

LOCK_LEVEL is defined in an i386_solaris system file, causing the compile

to break.  renaming to PG_LOCK_LEVEL
parent b34c8ec3
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * 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: * NOTES:
* (1) The lock.c module assumes that the caller here is doing * (1) The lock.c module assumes that the caller here is doing
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
static bool static bool
MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt,
LOCK_LEVEL level); PG_LOCK_LEVEL level);
static bool static bool
MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt, 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 * INTENT indicates to higher level that a lower level lock has been
...@@ -201,7 +201,7 @@ static bool ...@@ -201,7 +201,7 @@ static bool
MultiAcquire(LockTableId tableId, MultiAcquire(LockTableId tableId,
LOCKTAG *tag, LOCKTAG *tag,
LOCKT lockt, LOCKT lockt,
LOCK_LEVEL level) PG_LOCK_LEVEL level)
{ {
LOCKT locks[N_LEVELS]; LOCKT locks[N_LEVELS];
int i, int i,
...@@ -361,7 +361,7 @@ static bool ...@@ -361,7 +361,7 @@ static bool
MultiRelease(LockTableId tableId, MultiRelease(LockTableId tableId,
LOCKTAG *tag, LOCKTAG *tag,
LOCKT lockt, LOCKT lockt,
LOCK_LEVEL level) PG_LOCK_LEVEL level)
{ {
LOCKT locks[N_LEVELS]; LOCKT locks[N_LEVELS];
int i, int i,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -39,7 +39,7 @@
#define RELN_LEVEL 0 #define RELN_LEVEL 0
#define PAGE_LEVEL 1 #define PAGE_LEVEL 1
#define TUPLE_LEVEL 2 #define TUPLE_LEVEL 2
typedef int LOCK_LEVEL; typedef int PG_LOCK_LEVEL;
/* multi.c */ /* multi.c */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment