Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1de8926

Browse files
committed
LOCK_LEVEL is defined in an i386_solaris system file, causing the compile
to break. renaming to PG_LOCK_LEVEL
1 parent b34c8ec commit 1de8926

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/backend/storage/lmgr/multi.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.10 1998/01/07 21:05:35 momjian Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.11 1998/01/23 19:53:40 scrappy Exp $
1616
*
1717
* NOTES:
1818
* (1) The lock.c module assumes that the caller here is doing
@@ -31,10 +31,10 @@
3131

3232
static bool
3333
MultiAcquire(LockTableId tableId, LOCKTAG *tag, LOCKT lockt,
34-
LOCK_LEVEL level);
34+
PG_LOCK_LEVEL level);
3535
static bool
3636
MultiRelease(LockTableId tableId, LOCKTAG *tag, LOCKT lockt,
37-
LOCK_LEVEL level);
37+
PG_LOCK_LEVEL level);
3838

3939
/*
4040
* INTENT indicates to higher level that a lower level lock has been
@@ -201,7 +201,7 @@ static bool
201201
MultiAcquire(LockTableId tableId,
202202
LOCKTAG *tag,
203203
LOCKT lockt,
204-
LOCK_LEVEL level)
204+
PG_LOCK_LEVEL level)
205205
{
206206
LOCKT locks[N_LEVELS];
207207
int i,
@@ -361,7 +361,7 @@ static bool
361361
MultiRelease(LockTableId tableId,
362362
LOCKTAG *tag,
363363
LOCKT lockt,
364-
LOCK_LEVEL level)
364+
PG_LOCK_LEVEL level)
365365
{
366366
LOCKT locks[N_LEVELS];
367367
int i,

src/include/storage/multilev.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: multilev.h,v 1.5 1997/09/08 02:39:05 momjian Exp $
10+
* $Id: multilev.h,v 1.6 1998/01/23 19:53:44 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -39,7 +39,7 @@
3939
#define RELN_LEVEL 0
4040
#define PAGE_LEVEL 1
4141
#define TUPLE_LEVEL 2
42-
typedef int LOCK_LEVEL;
42+
typedef int PG_LOCK_LEVEL;
4343

4444
/* multi.c */
4545

0 commit comments

Comments
 (0)