From a53c7ca130480121c7dda62d129ad11018268326 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 12 May 2008 16:06:10 +0000 Subject: [PATCH] Put back bufmgr.h in bufpage.h -- it is needed by some macros. Remove #include bufmgr.h from (most?) source files which already include bufpage.h. --- src/backend/access/gin/ginentrypage.c | 1 - src/backend/access/heap/heapam.c | 1 - src/backend/access/heap/hio.c | 1 - src/backend/access/heap/pruneheap.c | 1 - src/backend/access/heap/rewriteheap.c | 1 - src/backend/access/transam/xlog.c | 1 - src/backend/access/transam/xlogutils.c | 1 - src/backend/commands/analyze.c | 1 - src/backend/storage/buffer/bufmgr.c | 1 - src/include/storage/bufpage.h | 1 + 10 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index 861b4c138a..8630a6881a 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -15,7 +15,6 @@ #include "postgres.h" #include "access/gin.h" #include "access/tuptoaster.h" -#include "storage/bufmgr.h" /* * forms tuple for entry tree. On leaf page, Index tuple has diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 6c20b48cc4..c1afff3742 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -52,7 +52,6 @@ #include "catalog/namespace.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "storage/lmgr.h" #include "storage/procarray.h" #include "storage/smgr.h" diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 2464c5ba6a..4da44db398 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -16,7 +16,6 @@ #include "postgres.h" #include "access/hio.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/freespace.h" #include "storage/lmgr.h" diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index b91f9b7bac..249a7373ce 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -19,7 +19,6 @@ #include "access/transam.h" #include "miscadmin.h" #include "pgstat.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/off.h" #include "utils/inval.h" diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 22cd90d1a6..775c4e23bd 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -106,7 +106,6 @@ #include "access/rewriteheap.h" #include "access/transam.h" #include "access/tuptoaster.h" -#include "storage/bufmgr.h" #include "storage/smgr.h" #include "utils/memutils.h" diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 918f75f9d1..27bd25ec10 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -40,7 +40,6 @@ #include "miscadmin.h" #include "pgstat.h" #include "postmaster/bgwriter.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/fd.h" #include "storage/ipc.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index fd5e51280e..1561d4ce2e 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -18,7 +18,6 @@ #include "postgres.h" #include "access/xlogutils.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/smgr.h" #include "utils/hsearch.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 1b2945ebd4..c4d61a6100 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -33,7 +33,6 @@ #include "parser/parse_relation.h" #include "pgstat.h" #include "postmaster/autovacuum.h" -#include "storage/bufmgr.h" #include "storage/proc.h" #include "storage/procarray.h" #include "utils/acl.h" diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index f63b49c34b..f098d1a307 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -36,7 +36,6 @@ #include "miscadmin.h" #include "postmaster/bgwriter.h" #include "storage/buf_internals.h" -#include "storage/bufmgr.h" #include "storage/bufpage.h" #include "storage/ipc.h" #include "storage/proc.h" diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index c72e1505c2..931ccf515b 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -15,6 +15,7 @@ #define BUFPAGE_H #include "access/xlog.h" +#include "storage/bufmgr.h" #include "storage/item.h" #include "storage/off.h" -- 2.39.5