From 1de8926bbed3161d0c7a93925a076c9f9d5f529a Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Fri, 23 Jan 1998 19:53:44 +0000
Subject: [PATCH] LOCK_LEVEL is defined in an i386_solaris system file, causing
the compile to break. renaming to PG_LOCK_LEVEL
---
src/backend/storage/lmgr/multi.c | 10 +++++-----
src/include/storage/multilev.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 1916b102acf..2196444299f 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 3d4aa1edbb9..0f8218e1755 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 */
--
GitLab