From 4bd7333b14786a2d757195e907709d2aee116809 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 27 Aug 2011 11:05:33 -0400
Subject: [PATCH] Allow more include files to be compiled in their own by
 adding missing include dependencies.

Modify pgcompinclude to skip a common fcinfo error.
---
 contrib/cube/cubedata.h             | 2 ++
 src/backend/replication/repl_gram.y | 1 +
 src/include/access/gin_private.h    | 1 +
 src/include/access/hash.h           | 1 +
 src/include/access/htup.h           | 1 +
 src/include/access/nbtree.h         | 2 +-
 src/include/access/xlog.h           | 2 +-
 src/tools/pginclude/pgcompinclude   | 3 +++
 8 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
index fd0c26a381..9760162494 100644
--- a/contrib/cube/cubedata.h
+++ b/contrib/cube/cubedata.h
@@ -1,5 +1,7 @@
 /* contrib/cube/cubedata.h */
 
+#include "fmgr.h"
+
 #define CUBE_MAX_DIM (100)
 
 typedef struct NDBOX
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index d99708ca8e..70b34ff82e 100644
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -15,6 +15,7 @@
 
 #include "postgres.h"
 
+#include "access/xlogdefs.h"
 #include "nodes/makefuncs.h"
 #include "nodes/replnodes.h"
 #include "replication/walsender.h"
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index a79c003a9f..290f0edaef 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -14,6 +14,7 @@
 #include "access/gin.h"
 #include "access/itup.h"
 #include "fmgr.h"
+#include "storage/bufmgr.h"
 #include "utils/rbtree.h"
 
 
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 13ff37ab0b..d9a23aed84 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -22,6 +22,7 @@
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "fmgr.h"
+#include "storage/bufmgr.h"
 #include "storage/lock.h"
 #include "utils/relcache.h"
 
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index ba5d9b28ef..c0258354e6 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -16,6 +16,7 @@
 
 #include "access/tupdesc.h"
 #include "access/tupmacs.h"
+#include "storage/bufpage.h"
 #include "storage/itemptr.h"
 #include "storage/relfilenode.h"
 
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index b62e42cfde..4e20c79ca6 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -19,7 +19,7 @@
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "access/xlogutils.h"
-
+#include "catalog/pg_index.h"
 
 /* There's room for a 16-bit vacuum cycle ID in BTPageOpaqueData */
 typedef uint16 BTCycleId;
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index cdbf63fa76..1fd60fb98d 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -14,11 +14,11 @@
 #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"
 
-
 /*
  * The overall layout of an XLOG record is:
  *		Fixed-size header (XLogRecord struct)
diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude
index fdbf58e16a..89768335e6 100755
--- a/src/tools/pginclude/pgcompinclude
+++ b/src/tools/pginclude/pgcompinclude
@@ -14,6 +14,9 @@ do
 	sed 's/->[a-zA-Z0-9_\.]*//g' "$FILE" >/tmp/$$a
 	echo "#include \"postgres.h\"" >/tmp/$$.c
 	echo "#include \"/tmp/$$a\"" >>/tmp/$$.c
+	# supress fcinfo errors
+	echo "#undef PG_GETARG_DATUM" >>/tmp/$$.c
+	echo "#define PG_GETARG_DATUM(n)" >>/tmp/$$.c
 	echo "void include_test(void);" >>/tmp/$$.c
 	echo "void include_test() {" >>/tmp/$$.c
 	pgdefine "$FILE" >>/tmp/$$.c