diff options
| author | Andres Freund <andres@anarazel.de> | 2015-08-06 12:38:35 +0200 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2015-08-06 12:41:59 +0200 |
| commit | 449b13313caf63c2db936cc46d8a25cfcd9a0d04 (patch) | |
| tree | 879d31df1738679edce12cf1559de7ab7837834e /src | |
| parent | 4877281f3a1640577bedd1e92a83931469284368 (diff) | |
| download | postgresql-449b13313caf63c2db936cc46d8a25cfcd9a0d04.tar.gz postgresql-449b13313caf63c2db936cc46d8a25cfcd9a0d04.zip | |
Improve includes introduced in the replication origins patch.
pg_resetxlog.h contained two superfluous includes, origin.h superfluously
depended on logical.h, and pg_xlogdump's rmgrdesc.h only indirectly
included origin.h.
Backpatch: 9.5, where replication origins were introduced.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_resetxlog/pg_resetxlog.c | 2 | ||||
| -rw-r--r-- | src/bin/pg_xlogdump/rmgrdesc.c | 1 | ||||
| -rw-r--r-- | src/include/replication/origin.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index e7e8059a38d..72755b064d5 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -56,8 +56,6 @@ #include "common/restricted_token.h" #include "storage/large_object.h" #include "pg_getopt.h" -#include "replication/logical.h" -#include "replication/origin.h" static ControlFileData ControlFile; /* pg_control values */ diff --git a/src/bin/pg_xlogdump/rmgrdesc.c b/src/bin/pg_xlogdump/rmgrdesc.c index 2205d6e6896..5b88a8dd67a 100644 --- a/src/bin/pg_xlogdump/rmgrdesc.c +++ b/src/bin/pg_xlogdump/rmgrdesc.c @@ -25,6 +25,7 @@ #include "commands/dbcommands_xlog.h" #include "commands/sequence.h" #include "commands/tablespace.h" +#include "replication/origin.h" #include "rmgrdesc.h" #include "storage/standby.h" #include "utils/relmapper.h" diff --git a/src/include/replication/origin.h b/src/include/replication/origin.h index 5d294de60e4..8cec43410f1 100644 --- a/src/include/replication/origin.h +++ b/src/include/replication/origin.h @@ -10,9 +10,11 @@ #ifndef PG_ORIGIN_H #define PG_ORIGIN_H +#include "fmgr.h" +#include "access/xlog.h" #include "access/xlogdefs.h" +#include "access/xlogreader.h" #include "catalog/pg_replication_origin.h" -#include "replication/logical.h" typedef struct xl_replorigin_set { |