diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-04 01:13:16 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-04 01:13:16 -0400 |
| commit | 1609797c25f6b440371045039733d69fe8cb9410 (patch) | |
| tree | 7bd7b661545d483b19e11e33fccde8eee9b6c61b /src/include/access | |
| parent | f116b1f5b8d36e54404b36f1aba1295cbcfc4fdc (diff) | |
| download | postgresql-1609797c25f6b440371045039733d69fe8cb9410.tar.gz postgresql-1609797c25f6b440371045039733d69fe8cb9410.zip | |
Clean up the #include mess a little.
walsender.h should depend on xlog.h, not vice versa. (Actually, the
inclusion was circular until a couple hours ago, which was even sillier;
but Bruce broke it in the expedient rather than logically correct
direction.) Because of that poor decision, plus blind application of
pgrminclude, we had a situation where half the system was depending on
xlog.h to include such unrelated stuff as array.h and guc.h. Clean up
the header inclusion, and manually revert a lot of what pgrminclude had
done so things build again.
This episode reinforces my feeling that pgrminclude should not be run
without adult supervision. Inclusion changes in header files in particular
need to be reviewed with great care. More generally, it'd be good if we
had a clearer notion of module layering to dictate which headers can sanely
include which others ... but that's a big task for another day.
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/gin.h | 1 | ||||
| -rw-r--r-- | src/include/access/heapam.h | 2 | ||||
| -rw-r--r-- | src/include/access/xact.h | 2 | ||||
| -rw-r--r-- | src/include/access/xlog.h | 1 | ||||
| -rw-r--r-- | src/include/access/xlog_internal.h | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/src/include/access/gin.h b/src/include/access/gin.h index aeba4c1e080..31e9733546a 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -11,6 +11,7 @@ #define GIN_H #include "access/xlog.h" +#include "storage/block.h" #include "utils/relcache.h" diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index b8d06abf1f3..776ea5c4cc5 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -17,6 +17,8 @@ #include "access/sdir.h" #include "access/skey.h" #include "access/xlog.h" +#include "nodes/primnodes.h" +#include "storage/lock.h" #include "utils/relcache.h" #include "utils/snapshot.h" diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 575bcd3cde1..aaa620469f1 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -15,6 +15,8 @@ #define XACT_H #include "access/xlog.h" +#include "nodes/pg_list.h" +#include "storage/relfilenode.h" /* diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 64f342ce594..3771ccbec4c 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -14,7 +14,6 @@ #include "access/rmgr.h" #include "access/xlogdefs.h" #include "lib/stringinfo.h" -#include "replication/walsender.h" #include "storage/buf.h" #include "utils/pg_crc.h" #include "utils/timestamp.h" diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 097072ced13..68c06910159 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -17,6 +17,8 @@ #define XLOG_INTERNAL_H #include "access/xlog.h" +#include "storage/block.h" +#include "storage/relfilenode.h" /* |