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.

diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c
index 861b4c138aaf87e5e21675dd3ab977c24282cf7c..8630a6881a2d92b7d162c794bee5078ec0894371 100644 (file)
--- 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 6c20b48cc4806892a756c87c80caf46b3f33b197..c1afff3742173a9479f95c74b9189d999f910311 100644 (file)
--- 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 2464c5ba6ac6885b92356d80df1ab00063f36ac5..4da44db398ed472105f7a4ca0e997e4f9f322cef 100644 (file)
--- 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 b91f9b7bacba5c0818b63a985ce9684f5cc651c4..249a7373ce84426717911f8a0e143e14b4cb8cc5 100644 (file)
--- 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 22cd90d1a683510c6186db3ea28fcf0e6129ae0a..775c4e23bdcb647ba80ddc0e2187981fbb5c9338 100644 (file)
--- 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 918f75f9d17c7e621488d485c34dc0cd9883ec0b..27bd25ec100c1aa56cd48dcf804085aeec288f69 100644 (file)
--- 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 fd5e51280e30aa4daac6ff3bacb97d46f0383b6e..1561d4ce2e6e4dc3f12f8864ba4d3d56323aa3ba 100644 (file)
--- 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 1b2945ebd47cc2729b7f9fe7aaf38c4b180db531..c4d61a6100190ef7ab61bf5905159711fae5be3a 100644 (file)
--- 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 f63b49c34ba2557136b0934e6e347589d3678357..f098d1a307691bcdd06e9019abd24ad08febda39 100644 (file)
--- 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 c72e1505c20411006e5e24368c898cb5c665b5eb..931ccf515b476a02af3cc06db9e9fd4bf4923e81 100644 (file)
--- 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"