For some reason access/tupmacs.h has been #including utils/memutils.h,

which is neither needed by nor related to that header.  Remove the bogus
inclusion and instead include the header in those C files that actually
need it.  Also fix unnecessary inclusions and bad inclusion order in
tsearch2 files.

diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c
index 0b7fb7288c6dc73b95665291cc6e0bcd12c065fc..de81846e3749e662bf14da3628a36cf7a816109d 100644 (file)
--- a/contrib/tsearch2/dict.c
+++ b/contrib/tsearch2/dict.c
@@ -2,16 +2,15 @@
  * interface functions to dictionary
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
 #include <ctype.h>
 
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
+#include "fmgr.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
 
 #include "dict.h"
 #include "common.h"

diff --git a/contrib/tsearch2/dict_ex.c b/contrib/tsearch2/dict_ex.c
index 241161a5c21567a4338751107f8280b89f56e8ae..cee2d1e9760768ad26b81cfcfe6d5b608460d382 100644 (file)
--- a/contrib/tsearch2/dict_ex.c
+++ b/contrib/tsearch2/dict_ex.c
@@ -2,10 +2,6 @@
  * example of dictionary
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"

diff --git a/contrib/tsearch2/dict_ispell.c b/contrib/tsearch2/dict_ispell.c
index 9af11edf8e21434afb59a16805bd2431476e58f2..12d9205a4eb032d33634ecf000a87ef524af2f00 100644 (file)
--- a/contrib/tsearch2/dict_ispell.c
+++ b/contrib/tsearch2/dict_ispell.c
@@ -2,12 +2,10 @@
  * ISpell interface
  * Teodor Sigaev <[email protected]>
  */
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "dict.h"
 #include "common.h"
 #include "ispell/spell.h"

diff --git a/contrib/tsearch2/dict_snowball.c b/contrib/tsearch2/dict_snowball.c
index 03850b33ea44843d52e59e7ed83b30018062acbb..a43b49c2c565f33434834ec23a96ace318460f21 100644 (file)
--- a/contrib/tsearch2/dict_snowball.c
+++ b/contrib/tsearch2/dict_snowball.c
@@ -3,9 +3,6 @@
  * http://snowball.tartarus.org/
  * Teodor Sigaev <[email protected]>
  */
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"

diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c
index 6e3ed8643450892d7352f4d03aed90a2773ae503..d3e884212b39ed83a24c59020e318a2af59d08cd 100644 (file)
--- a/contrib/tsearch2/dict_syn.c
+++ b/contrib/tsearch2/dict_syn.c
@@ -2,13 +2,10 @@
  * ISpell interface
  * Teodor Sigaev <[email protected]>
  */
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "dict.h"
 #include "common.h"
 

diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c
index 0837451f22727e040ea176555dfc452a69d2cb97..af83b6506d47dace4588c54396647ca5d88e5d73 100644 (file)
--- a/contrib/tsearch2/prs_dcfg.c
+++ b/contrib/tsearch2/prs_dcfg.c
@@ -2,12 +2,10 @@
  * Simple config parser
  * Teodor Sigaev <[email protected]>
  */
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "dict.h"
 #include "common.h"
 

diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c
index c152b1ac2386a9b890cde14b5f5b8f3ba60b1697..9aa0e2214f6bf96acbf5121edf90b34519570f4f 100644 (file)
--- a/contrib/tsearch2/snmap.c
+++ b/contrib/tsearch2/snmap.c
@@ -2,11 +2,8 @@
  * simple but fast map from str to Oid
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
+
 #include "snmap.h"
 #include "common.h"
 

diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
index 735d406109f1e7194f5a9c2986855127db036e53..c5916b0f0d95e08ef97981da05b9932fb65e6d63 100644 (file)
--- a/contrib/tsearch2/ts_cfg.c
+++ b/contrib/tsearch2/ts_cfg.c
@@ -2,17 +2,16 @@
  * interface functions to tscfg
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
 #include <ctype.h>
 #include <locale.h>
 
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
+#include "fmgr.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
 
 #include "ts_cfg.h"
 #include "dict.h"

diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c
index 33bfd4d87e817523b8917bfa79cf30eae243bf1d..39cd673bb0b43bd616ecca72389784a58d7f3e69 100644 (file)
--- a/contrib/tsearch2/wparser.c
+++ b/contrib/tsearch2/wparser.c
@@ -2,17 +2,16 @@
  * interface functions to parser
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
 #include <ctype.h>
 
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
+#include "fmgr.h"
 #include "funcapi.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
 
 #include "wparser.h"
 #include "ts_cfg.h"

diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
index 93368b1e8974ea89b5de8e30c0e92fae81fa6e40..a33bacf31bc2df599a2341eae93e0cb909c585a1 100644 (file)
--- a/contrib/tsearch2/wparser_def.c
+++ b/contrib/tsearch2/wparser_def.c
@@ -2,11 +2,8 @@
  * default word parser
  * Teodor Sigaev <[email protected]>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
+
 #include "utils/builtins.h"
 
 #include "dict.h"

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 2c9cf5c4ba829da4f4cdd84839f89b56335f0256..483a476c531b71e86b6fe56bf22c26d415fffb5e 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -26,6 +26,7 @@
 #include "miscadmin.h"
 #include "storage/freespace.h"
 #include "storage/smgr.h"
+#include "utils/memutils.h"
 
 
 /* Working state for btbuild and its callback */

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 9b0c6502227d9e83fe9b337aebfd1557c6509851..e4d590c30b513fdf5350a208e8414928c3ad036e 100644 (file)
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -43,6 +43,7 @@
 #include "utils/fmgroids.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/relcache.h"
 

diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 93300a5fcb2129ad9e358034c22eefe9c88ba2b9..a42cdfff6ee3d8d403d86db7d293936af65ed0be 100644 (file)
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -44,6 +44,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 48c7c40eeaec7ef3e015a3ed1a884ea92c78ccfa..92dac90dffc7ec7f8a51b4a2d35da10ca821b57a 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -34,6 +34,7 @@
 #include "utils/datum.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 

diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 30506b0e087649a5e779c4fb0399c486cbb3cf3a..ee54de2ae851521cd9d1ec039c45fecacac76932 100644 (file)
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -75,7 +75,6 @@
 
 #include <unistd.h>
 #include <signal.h>
-#include <errno.h>
 #include <netinet/in.h>
 
 #include "access/heapam.h"
@@ -88,6 +87,7 @@
 #include "storage/sinval.h"
 #include "tcop/tcopprot.h"
 #include "utils/fmgroids.h"
+#include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/syscache.h"
 

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 0858a3c5675d4a55ff89e70fd6daa75c9bb09d1a..9979afaab85632c28ecf331fea4b191404446b52 100644 (file)
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -32,6 +32,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/relcache.h"
 

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 5d4a238e5c0470de2f8b9d95f43866652598c1ac..fca509de9598b2fe70b3dcfddee9e208886e5dd1 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -43,8 +43,9 @@
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/relcache.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
+#include "utils/relcache.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 6b015bfcd08e78c940c42ec16d086263a90f32eb..d36313276c5ed9af3fccf4975d4cb6504fbca174 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -40,6 +40,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 620861fffb12995a7102ea499d664cc08cdda982..8ea8b254286df392e5cfb31f8a50610a10f121b4 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -58,6 +58,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index cfb03b7894f900b01b02b7fa93a1d485c19fb794..734d5c0580bf50bb210dccf6b0f58e17ab008ffd 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -36,6 +36,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index fa5470cfd5f542bab983fdfdb31add3109e6edec..929335ca01714fc08739b8b64c8b719f2b476d63 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -59,6 +59,7 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 3502b985ad83c6dd2655e9d0de653d59ab4952c2..f02e7dfcd87a55bf27106b39e6a1211f95800946 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -44,6 +44,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "pgstat.h"

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 2e4da3bb90b5cca05743a067acd5a649067645fd..6d0129f7eae86f165e8d0692e5aaf643f994c223 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -47,6 +47,7 @@
 #include "utils/acl.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 
 
 typedef struct execRowMark

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 34de0a41c3a9d5e05d04be4c497609b03ab726bc..ee217df7eaf91106e81b3af9483d7cf28c6d616a 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -51,6 +51,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/typcache.h"
 
 

diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 666c6c18bd690c30593aae442d6712362dd7a207..40398713d0ed0da7f0631d7fc623757981a8fa53 100644 (file)
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -83,6 +83,7 @@
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 #include "utils/datum.h"

diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index a2c74b782c8c7780cdc11bd18079b77581a6ecb5..51182c67367461b022c13db858a57272eebb5ac9 100644 (file)
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -39,6 +39,7 @@
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapHeapscan.h"
 #include "parser/parsetree.h"
+#include "utils/memutils.h"
 
 
 static TupleTableSlot *BitmapHeapNext(BitmapHeapScanState *node);

diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index fc8b615dc165b40b1851ffb9b7c863383cceab72..11bea2a783b8c0940659f427a8935e515e70c341 100644 (file)
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -27,6 +27,7 @@
 #include "executor/nodeBitmapIndexscan.h"
 #include "executor/nodeIndexscan.h"
 #include "miscadmin.h"
+#include "utils/memutils.h"
 
 
 /* ----------------------------------------------------------------

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 110879be595c98208206312c935db6123ce016f1..2587a9b42c42fd00d6734e5f0f37d0aec305d7a9 100644 (file)
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -32,6 +32,7 @@
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "parser/parsetree.h"
+#include "utils/memutils.h"
 
 
 static TupleTableSlot *IndexNext(IndexScanState *node);

diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index b736688802058a92ff4cf6c0a5f8ee2dd9b06340..311e25238af97ee84d4b2b6b9a4235e8bc782097 100644 (file)
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -73,6 +73,7 @@
 #include "executor/execdefs.h"
 #include "executor/nodeMergejoin.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c
index a0daf963e74c2fd4c97c8997e75a7d36ad04747e..e5b8daa1f5c274e0cd8e8b63250aa24f4c3ce7c9 100644 (file)
--- a/src/backend/executor/nodeSetOp.c
+++ b/src/backend/executor/nodeSetOp.c
@@ -37,6 +37,7 @@
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "executor/nodeSetOp.h"
+#include "utils/memutils.h"
 
 
 /* ----------------------------------------------------------------

diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 0f4c588072cb71bbe7b9d18e30e37b75da67a367..b06b2b26b140ad50383549c1058c157ac46f05b0 100644 (file)
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -27,6 +27,7 @@
 #include "utils/array.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 
 
 static Datum ExecHashSubPlan(SubPlanState *node,

diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index f32f5e6c527d210c155877dd7dec40a8e0ed0767..4c34478b11cf0aae94e5105b275f45248aae1adf 100644 (file)
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -28,6 +28,7 @@
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "executor/nodeUnique.h"
+#include "utils/memutils.h"
 
 
 /* ----------------------------------------------------------------

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 18ee4cdce7fb60aabaf9268b0460371c897020c0..fba5f6fa2cbebfc2943f6ddafa1bdee497a1f9d1 100644 (file)
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -20,6 +20,7 @@
 #include "executor/spi_priv.h"
 #include "tcop/tcopprot.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/typcache.h"
 
 

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 952d70947a6136b2904abd9a410b551dcf3b437b..3e4b2e5f2fe7469ffee6e3696e651a3715e33dac 100644 (file)
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -37,6 +37,7 @@
 #include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/selfuncs.h"
 #include "utils/syscache.h"

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index ac96f6b471e092ceefeb3bd816c0359032edf8e5..b0308e181e717e9aa6fccbd7225d11166fd6952e 100644 (file)
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -29,6 +29,7 @@
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/catcache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/resowner.h"
 #include "utils/syscache.h"

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a4f1f1f7865b6d0e9efc29e77e26250ac74d0b88..41fb1e1fb7f77f66d7738fb1ce86cb6a71b9c454 100644 (file)
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -58,6 +58,7 @@
 #include "utils/fmgroids.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/relcache.h"
 #include "utils/resowner.h"
 #include "utils/syscache.h"

diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index d1121e5c292ce9c3fe968688750ab5ec7b1948e8..47515e6d0dc791ea4f6c79b79f8d8c6d903fad55 100644 (file)
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -94,6 +94,7 @@
 #include "utils/datum.h"
 #include "utils/logtape.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/tuplesort.h"
 

diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index e1de7bd557f3f5c49786852c911c5fbfc6160e93..c6b66c1b0f94694f8eec3a6c17e21ca40099030d 100644 (file)
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -45,8 +45,10 @@
 
 #include "access/heapam.h"
 #include "storage/buffile.h"
+#include "utils/memutils.h"
 #include "utils/tuplestore.h"
 
+
 /*
  * Possible states of a Tuplestore object.     These denote the states that
  * persist between calls of Tuplestore routines.

diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 6208366d7a7fab940a9c15e677946b8011987c61..a11072fb27eccddbe8760896d3fd4db2cc995b9e 100644 (file)
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -14,7 +14,6 @@
 #ifndef TUPMACS_H
 #define TUPMACS_H
 
-#include "utils/memutils.h"
 
 /*
  * check to see if the ATT'th bit of an array of 8-bit bytes is set.

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 3b7b4ca3a5ce5b9700ad7e6137761be0e27dc0a7..10312149920d7609c830cf6ea33eedcb3fa98211 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -51,6 +51,7 @@
 #include "executor/spi.h"
 #include "funcapi.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/typcache.h"
 
 /* perl stuff */

diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index c155e4d5eb336a80107d5aa8030dbfdf38688b3e..2ec43ba40f47807e8a16efe81550ff4f44722238 100644 (file)
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -56,6 +56,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 
 

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 7ceaa2cba1a8b3a72708c1389478a18c55a43bda..780f1d2af6a9e5207febbf8748d5bffaf157b382 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -51,6 +51,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/typcache.h"
 
 

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 6bc25ccce6c6016b916ab6a720a165c98801c395..7723f7e45e751e5cff7a10a638e1fd313cd66b61 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -52,6 +52,7 @@
 #include "parser/parse_type.h"
 #include "tcop/tcopprot.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 

diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 28d7804c2d8cfb94980794f5f36511f12c86a211..5a5ba216591375ce0febd58eb1540f468972d7ed 100644 (file)
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -58,6 +58,7 @@
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/typcache.h"