From 30faaa8fe40d1f95480de3ad00b9576fd4ea7e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= Date: Sun, 22 Mar 2026 17:52:12 +0100 Subject: [PATCH v2 05/15] standby.h doesn't need the full lock.h --- contrib/amcheck/verify_heapam.c | 1 + src/include/storage/lock.h | 2 +- src/include/storage/standby.h | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/amcheck/verify_heapam.c b/contrib/amcheck/verify_heapam.c index ada782f98f5..20ff58aa782 100644 --- a/contrib/amcheck/verify_heapam.c +++ b/contrib/amcheck/verify_heapam.c @@ -24,6 +24,7 @@ #include "funcapi.h" #include "miscadmin.h" #include "storage/bufmgr.h" +#include "storage/lwlock.h" #include "storage/procarray.h" #include "storage/read_stream.h" #include "utils/builtins.h" diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 9505701a805..fa68e6ecece 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -59,7 +59,7 @@ extern PGDLLIMPORT bool Debug_deadlocks; * coding errors from trying to use struct assignment with it; instead use * GET_VXID_FROM_PGPROC(). */ -typedef struct +typedef struct VirtualTransactionId { ProcNumber procNumber; /* proc number of the PGPROC */ LocalTransactionId localTransactionId; /* lxid from PGPROC */ diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index c63a4f2cc6a..6a314c693cd 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -15,10 +15,13 @@ #define STANDBY_H #include "datatype/timestamp.h" -#include "storage/lock.h" +#include "storage/locktag.h" #include "storage/relfilelocator.h" #include "storage/standbydefs.h" +typedef struct PGPROC PGPROC; +typedef struct VirtualTransactionId VirtualTransactionId; + /* User-settable GUC parameters */ extern PGDLLIMPORT int max_standby_archive_delay; extern PGDLLIMPORT int max_standby_streaming_delay; -- 2.47.3