From a6257cff0c11ba53af85810efb9d119a78b94ca5 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 16 Jun 2026 21:56:45 +0300 Subject: [PATCH v13 7/9] Remove dependency on utils/resowner.h just for ResourceOwner typedef --- src/backend/executor/nodeAppend.c | 1 + src/backend/postmaster/auxprocess.c | 1 + src/include/storage/waiteventset.h | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 2c67218912e..c6ab9d5e19e 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -66,6 +66,7 @@ #include "pgstat.h" #include "storage/latch.h" #include "storage/lwlock.h" +#include "utils/resowner.h" #include "utils/wait_event.h" /* Shared state for parallel-aware Append. */ diff --git a/src/backend/postmaster/auxprocess.c b/src/backend/postmaster/auxprocess.c index ab2af862d69..ae7505b9903 100644 --- a/src/backend/postmaster/auxprocess.c +++ b/src/backend/postmaster/auxprocess.c @@ -25,6 +25,7 @@ #include "storage/procsignal.h" #include "utils/memutils.h" #include "utils/ps_status.h" +#include "utils/resowner.h" #include "utils/wait_event.h" diff --git a/src/include/storage/waiteventset.h b/src/include/storage/waiteventset.h index 5341267f0a0..b18e4815bfc 100644 --- a/src/include/storage/waiteventset.h +++ b/src/include/storage/waiteventset.h @@ -25,8 +25,6 @@ #ifndef WAITEVENTSET_H #define WAITEVENTSET_H -#include "utils/resowner.h" - /* * Bitmasks for events that may wake-up WaitLatch(), WaitLatchOrSocket(), or * WaitEventSetWait(). @@ -71,13 +69,14 @@ typedef struct WaitEvent typedef struct WaitEventSet WaitEventSet; struct Latch; +struct ResourceOwnerData; /* * prototypes for functions in waiteventset.c */ extern void InitializeWaitEventSupport(void); -extern WaitEventSet *CreateWaitEventSet(ResourceOwner resowner, int nevents); +extern WaitEventSet *CreateWaitEventSet(struct ResourceOwnerData *resowner, int nevents); extern void FreeWaitEventSet(WaitEventSet *set); extern void FreeWaitEventSetAfterFork(WaitEventSet *set); extern int AddWaitEventToSet(WaitEventSet *set, uint32 events, pgsocket fd, -- 2.47.3