Allow more include files to be compiled in their own by adding missing

include dependencies.

Modify pgcompinclude to skip a common fcinfo error.

diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
index fd0c26a381655eed175804e43c68f429d11864e6..97601624941f3cb4fc4cb908e1a01fdb9a945a64 100644 (file)
--- 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 d99708ca8ebb3c29564e0031282b61ea9e47770e..70b34ff82e213b9818fd81a791f5228d8e68333b 100644 (file)
--- 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 a79c003a9f10c21cd9071c580628c1612c6fea48..290f0edaefa3752ba90fcf144bedfcf59b13a3a7 100644 (file)
--- 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 13ff37ab0b070d545f7f0aa589fdf6e1b7321950..d9a23aed8400c0dba1c7ba89a4bd065b1cf96916 100644 (file)
--- 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 ba5d9b28ef19f3054191cf0f8b358ac5831a9e26..c0258354e6f91c92559bf36be752011b9ba8bf32 100644 (file)
--- 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 b62e42cfde157c0f885ea91bdc48fb18f4dd4ac4..4e20c79ca6effa1557b52c7ad01203149267b66d 100644 (file)
--- 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 cdbf63fa76e0e7b154c084191d0df6138e1cbfcc..1fd60fb98d7362b677112517a20a41e32227a34f 100644 (file)
--- 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 fdbf58e16a760b04c312c0dbe181cabdda9c157d..89768335e64eb9512dae5f8f5035eaf06a00d5fc 100755 (executable)
--- 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