Commit1de8926

committed

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

to break. renaming to PG_LOCK_LEVEL

1 parentb34c8ec commit1de8926Copy full SHA for 1de8926

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* 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 $`
`16`	`16`	`*`
`17`	`17`	`* NOTES:`
`18`	`18`	`* (1) The lock.c module assumes that the caller here is doing`
`@@ -31,10 +31,10 @@`
`31`	`31`
`32`	`32`	`staticbool`
`33`	`33`	`MultiAcquire(LockTableIdtableId,LOCKTAG*tag,LOCKTlockt,`
`34`		`-LOCK_LEVELlevel);`
	`34`	`+PG_LOCK_LEVELlevel);`
`35`	`35`	`staticbool`
`36`	`36`	`MultiRelease(LockTableIdtableId,LOCKTAG*tag,LOCKTlockt,`
`37`		`-LOCK_LEVELlevel);`
	`37`	`+PG_LOCK_LEVELlevel);`
`38`	`38`
`39`	`39`	`/*`
`40`	`40`	`* INTENT indicates to higher level that a lower level lock has been`
`@@ -201,7 +201,7 @@ static bool`
`201`	`201`	`MultiAcquire(LockTableIdtableId,`
`202`	`202`	`LOCKTAG*tag,`
`203`	`203`	`LOCKTlockt,`
`204`		`-LOCK_LEVELlevel)`
	`204`	`+PG_LOCK_LEVELlevel)`
`205`	`205`	`{`
`206`	`206`	`LOCKTlocks[N_LEVELS];`
`207`	`207`	`inti,`
`@@ -361,7 +361,7 @@ static bool`
`361`	`361`	`MultiRelease(LockTableIdtableId,`
`362`	`362`	`LOCKTAG*tag,`
`363`	`363`	`LOCKTlockt,`
`364`		`-LOCK_LEVELlevel)`
	`364`	`+PG_LOCK_LEVELlevel)`
`365`	`365`	`{`
`366`	`366`	`LOCKTlocks[N_LEVELS];`
`367`	`367`	`inti,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`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 $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -39,7 +39,7 @@`
`39`	`39`	`#defineRELN_LEVEL 0`
`40`	`40`	`#definePAGE_LEVEL 1`
`41`	`41`	`#defineTUPLE_LEVEL 2`
`42`		`-typedefintLOCK_LEVEL;`
	`42`	`+typedefintPG_LOCK_LEVEL;`
`43`	`43`
`44`	`44`	`/* multi.c */`
`45`	`45`

Comments

(0)