diff options
| author | Andres Freund | 2015-08-06 10:38:35 +0000 |
|---|---|---|
| committer | Andres Freund | 2015-08-06 10:41:46 +0000 |
| commit | 3a145757a0cd19bfce770abeefa16af674e1bc09 (patch) | |
| tree | 6d20fc7e3b7598aed9a595ef22168dc8064d46e0 | |
| parent | e641d7b22fae3086c1372fb0d117f629ec174a0b (diff) | |
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.
| -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 e7e8059a38..72755b064d 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 2205d6e689..5b88a8dd67 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 5d294de60e..8cec43410f 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 { |