From 7e638d7f5093fd24837ebe709135fa16ef8e3e7b Mon Sep 17 00:00:00 2001 From: Álvaro Herrera Date: Thu, 25 Sep 2025 14:45:08 +0200 Subject: Don't include execnodes.h in replication/conflict.h ... which silently propagates a lot of headers into many places via pgstat.h, as evidenced by the variety of headers that this patch needs to add to seemingly random places. Add a minimum of typedefs to conflict.h to be able to remove execnodes.h, and fix the fallout. Backpatch to 18, where conflict.h first appeared. Discussion: https://postgr.es/m/202509191927.uj2ijwmho7nv@alvherre.pgsql --- src/backend/utils/activity/pgstat_backend.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/backend/utils/activity/pgstat_backend.c') diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c index 07a1116671b..a864ae8e6a6 100644 --- a/src/backend/utils/activity/pgstat_backend.c +++ b/src/backend/utils/activity/pgstat_backend.c @@ -25,6 +25,7 @@ #include "postgres.h" #include "access/xlog.h" +#include "executor/instrument.h" #include "storage/bufmgr.h" #include "storage/proc.h" #include "storage/procarray.h" -- cgit v1.2.3