diff options
| author | Álvaro Herrera <alvherre@kurilemu.de> | 2025-09-25 14:45:08 +0200 |
|---|---|---|
| committer | Álvaro Herrera <alvherre@kurilemu.de> | 2025-09-25 14:52:41 +0200 |
| commit | 7e638d7f5093fd24837ebe709135fa16ef8e3e7b (patch) | |
| tree | 31f6837aa40c045b715128bee1e58281ff006a8c /src/include/replication | |
| parent | 81fc3e28e383d9a21843a5ab845a1bd1a1042e12 (diff) | |
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
Diffstat (limited to 'src/include/replication')
| -rw-r--r-- | src/include/replication/conflict.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/include/replication/conflict.h b/src/include/replication/conflict.h index e516caa5c73..c8fbf9e51b8 100644 --- a/src/include/replication/conflict.h +++ b/src/include/replication/conflict.h @@ -9,9 +9,16 @@ #ifndef CONFLICT_H #define CONFLICT_H -#include "nodes/execnodes.h" +#include "access/xlogdefs.h" +#include "nodes/pg_list.h" #include "utils/timestamp.h" +/* Avoid including execnodes.h here */ +typedef struct EState EState; +typedef struct ResultRelInfo ResultRelInfo; +typedef struct TupleTableSlot TupleTableSlot; + + /* * Conflict types that could occur while applying remote changes. * |