postgrespro
diff --git a/‎src/backend/storage/lmgr/deadlock.c
Lines changed: 6 additions & 6 deletions b/‎src/backend/storage/lmgr/deadlock.c
Lines changed: 6 additions & 6 deletions
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.4 2001/09/29 04:02:24 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.5 2001/09/29 21:35:14 momjian Exp $
  *
  *	Interface:
  *
@@ -382,7 +382,7 @@ FindLockCycleRecurse(PROC *checkProc,
 {
 	PROC	   *proc;
 	LOCK	   *lock;
-	HOLDER	   *holder;
+	PROCLOCK	   *holder;
 	SHM_QUEUE  *lockHolders;
 	LOCKMETHODTABLE *lockMethodTable;
 	LOCKMETHODCTL *lockctl;
@@ -434,8 +434,8 @@ FindLockCycleRecurse(PROC *checkProc,
 	 */
 	lockHolders = &(lock->lockHolders);
 
-	holder = (HOLDER *) SHMQueueNext(lockHolders, lockHolders,
-									 offsetof(HOLDER, lockLink));
+	holder = (PROCLOCK *) SHMQueueNext(lockHolders, lockHolders,
+									 offsetof(PROCLOCK, lockLink));
 
 	while (holder)
 	{
@@ -458,8 +458,8 @@ FindLockCycleRecurse(PROC *checkProc,
 			}
 		}
 
-		holder = (HOLDER *) SHMQueueNext(lockHolders, &holder->lockLink,
-										 offsetof(HOLDER, lockLink));
+		holder = (PROCLOCK *) SHMQueueNext(lockHolders, &holder->lockLink,
+										 offsetof(PROCLOCK, lockLink));
 	}
 
 	/*
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/deadlock.c,v 1.4 2001/09/29 04:02:24 tgl Exp $`
	`15`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.5 2001/09/29 21:35:14 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`* Interface:`
`18`	`18`	`*`
`@@ -382,7 +382,7 @@ FindLockCycleRecurse(PROC *checkProc,`
`382`	`382`	`{`
`383`	`383`	`PROC *proc;`
`384`	`384`	`LOCK *lock;`
`385`		`- HOLDER *holder;`
	`385`	`+ PROCLOCK *holder;`
`386`	`386`	`SHM_QUEUE *lockHolders;`
`387`	`387`	`LOCKMETHODTABLE *lockMethodTable;`
`388`	`388`	`LOCKMETHODCTL *lockctl;`
`@@ -434,8 +434,8 @@ FindLockCycleRecurse(PROC *checkProc,`
`434`	`434`	`*/`
`435`	`435`	`lockHolders = &(lock->lockHolders);`
`436`	`436`
`437`		`- holder = (HOLDER *) SHMQueueNext(lockHolders, lockHolders,`
`438`		`- offsetof(HOLDER, lockLink));`
	`437`	`+ holder = (PROCLOCK *) SHMQueueNext(lockHolders, lockHolders,`
	`438`	`+ offsetof(PROCLOCK, lockLink));`
`439`	`439`
`440`	`440`	`while (holder)`
`441`	`441`	`{`
`@@ -458,8 +458,8 @@ FindLockCycleRecurse(PROC *checkProc,`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`
`461`		`- holder = (HOLDER *) SHMQueueNext(lockHolders, &holder->lockLink,`
`462`		`- offsetof(HOLDER, lockLink));`
	`461`	`+ holder = (PROCLOCK *) SHMQueueNext(lockHolders, &holder->lockLink,`
	`462`	`+ offsetof(PROCLOCK, lockLink));`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`/*`