From 278bd0cc224615e41219e24304d04898941ab046 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 6 May 2005 17:24:55 +0000 Subject: [PATCH] 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. --- contrib/tsearch2/dict.c | 11 +++++------ contrib/tsearch2/dict_ex.c | 4 ---- contrib/tsearch2/dict_ispell.c | 6 ++---- contrib/tsearch2/dict_snowball.c | 3 --- contrib/tsearch2/dict_syn.c | 7 ++----- contrib/tsearch2/prs_dcfg.c | 6 ++---- contrib/tsearch2/snmap.c | 5 +---- contrib/tsearch2/ts_cfg.c | 11 +++++------ contrib/tsearch2/wparser.c | 11 +++++------ contrib/tsearch2/wparser_def.c | 5 +---- src/backend/access/nbtree/nbtree.c | 3 ++- src/backend/bootstrap/bootstrap.c | 3 ++- src/backend/catalog/index.c | 3 ++- src/backend/commands/analyze.c | 3 ++- src/backend/commands/async.c | 4 ++-- src/backend/commands/cluster.c | 3 ++- src/backend/commands/copy.c | 5 +++-- src/backend/commands/indexcmds.c | 3 ++- src/backend/commands/tablecmds.c | 3 ++- src/backend/commands/trigger.c | 3 ++- src/backend/commands/typecmds.c | 3 ++- src/backend/commands/vacuum.c | 3 ++- src/backend/executor/execMain.c | 3 ++- src/backend/executor/execQual.c | 3 ++- src/backend/executor/nodeAgg.c | 3 ++- src/backend/executor/nodeBitmapHeapscan.c | 3 ++- src/backend/executor/nodeBitmapIndexscan.c | 3 ++- src/backend/executor/nodeIndexscan.c | 3 ++- src/backend/executor/nodeMergejoin.c | 3 ++- src/backend/executor/nodeSetOp.c | 3 ++- src/backend/executor/nodeSubplan.c | 3 ++- src/backend/executor/nodeUnique.c | 3 ++- src/backend/executor/spi.c | 3 ++- src/backend/optimizer/path/indxpath.c | 3 ++- src/backend/utils/cache/catcache.c | 3 ++- src/backend/utils/cache/relcache.c | 3 ++- src/backend/utils/sort/tuplesort.c | 3 ++- src/backend/utils/sort/tuplestore.c | 4 +++- src/include/access/tupmacs.h | 3 +-- src/pl/plperl/plperl.c | 3 ++- src/pl/plpgsql/src/pl_comp.c | 3 ++- src/pl/plpgsql/src/pl_exec.c | 3 ++- src/pl/plpython/plpython.c | 3 ++- src/pl/tcl/pltcl.c | 3 ++- 44 files changed, 92 insertions(+), 83 deletions(-) diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c index 0b7fb7288c..de81846e37 100644 --- a/contrib/tsearch2/dict.c +++ b/contrib/tsearch2/dict.c @@ -2,16 +2,15 @@ * interface functions to dictionary * Teodor Sigaev */ -#include -#include -#include +#include "postgres.h" + #include -#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 241161a5c2..cee2d1e976 100644 --- a/contrib/tsearch2/dict_ex.c +++ b/contrib/tsearch2/dict_ex.c @@ -2,10 +2,6 @@ * example of dictionary * Teodor Sigaev */ -#include -#include -#include - #include "postgres.h" #include "dict.h" diff --git a/contrib/tsearch2/dict_ispell.c b/contrib/tsearch2/dict_ispell.c index 9af11edf8e..12d9205a4e 100644 --- a/contrib/tsearch2/dict_ispell.c +++ b/contrib/tsearch2/dict_ispell.c @@ -2,12 +2,10 @@ * ISpell interface * Teodor Sigaev */ -#include -#include -#include - #include "postgres.h" +#include + #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 03850b33ea..a43b49c2c5 100644 --- a/contrib/tsearch2/dict_snowball.c +++ b/contrib/tsearch2/dict_snowball.c @@ -3,9 +3,6 @@ * http://snowball.tartarus.org/ * Teodor Sigaev */ -#include -#include - #include "postgres.h" #include "dict.h" diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c index 6e3ed86434..d3e884212b 100644 --- a/contrib/tsearch2/dict_syn.c +++ b/contrib/tsearch2/dict_syn.c @@ -2,13 +2,10 @@ * ISpell interface * Teodor Sigaev */ -#include -#include -#include -#include - #include "postgres.h" +#include + #include "dict.h" #include "common.h" diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c index 0837451f22..af83b6506d 100644 --- a/contrib/tsearch2/prs_dcfg.c +++ b/contrib/tsearch2/prs_dcfg.c @@ -2,12 +2,10 @@ * Simple config parser * Teodor Sigaev */ -#include -#include -#include - #include "postgres.h" +#include + #include "dict.h" #include "common.h" diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c index c152b1ac23..9aa0e2214f 100644 --- a/contrib/tsearch2/snmap.c +++ b/contrib/tsearch2/snmap.c @@ -2,11 +2,8 @@ * simple but fast map from str to Oid * Teodor Sigaev */ -#include -#include -#include - #include "postgres.h" + #include "snmap.h" #include "common.h" diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c index 735d406109..c5916b0f0d 100644 --- a/contrib/tsearch2/ts_cfg.c +++ b/contrib/tsearch2/ts_cfg.c @@ -2,17 +2,16 @@ * interface functions to tscfg * Teodor Sigaev */ -#include -#include -#include +#include "postgres.h" + #include #include -#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 33bfd4d87e..39cd673bb0 100644 --- a/contrib/tsearch2/wparser.c +++ b/contrib/tsearch2/wparser.c @@ -2,17 +2,16 @@ * interface functions to parser * Teodor Sigaev */ -#include -#include -#include +#include "postgres.h" + #include -#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 93368b1e89..a33bacf31b 100644 --- a/contrib/tsearch2/wparser_def.c +++ b/contrib/tsearch2/wparser_def.c @@ -2,11 +2,8 @@ * default word parser * Teodor Sigaev */ -#include -#include -#include - #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 82f9051de7..010af6dd5c 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.127 2005/03/27 23:53:00 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.128 2005/05/06 17:24:52 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 8da05bbb7d..b38f9f9265 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.203 2005/05/01 18:56:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.204 2005/05/06 17:24:52 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 b18d07878d..ae02a890d4 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.253 2005/04/28 21:47:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.254 2005/05/06 17:24:52 tgl Exp $ * * * INTERFACE ROUTINES @@ -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 34bb0be151..9642fa9cf5 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.85 2005/04/14 20:03:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.86 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 3ddb9ae1a7..9914c724b7 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.121 2005/04/14 20:03:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.122 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,6 @@ #include #include -#include #include #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 e1c5a0ef77..5d3382a375 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.136 2005/04/14 20:03:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.137 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 13c8ba9daa..a40d6fc922 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.242 2005/05/06 02:56:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.243 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 93bdab2440..f4faebd06c 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.130 2005/04/14 20:03:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.131 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 446a6b9aed..279222ca1d 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.155 2005/04/14 20:03:24 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.156 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 70759b9d76..a78ad890b3 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.187 2005/04/28 21:47:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.188 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 0e83c14cdf..280022feaa 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.71 2005/05/01 18:56:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.72 2005/05/06 17:24:53 tgl Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -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 ba43288757..f9dbd3f461 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.307 2005/04/28 21:47:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.308 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 3e2b986034..b45850bd2b 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.247 2005/04/28 21:47:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.248 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 67c962398e..43e0c19d54 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.176 2005/04/06 16:34:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.177 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 c5963a1d12..5b5499454b 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -61,7 +61,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.132 2005/03/29 00:16:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.133 2005/05/06 17:24:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 141e29dd29..16d9bf0611 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.1 2005/04/19 22:35:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.2 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 ecb5a63013..231c35b956 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.8 2005/05/05 03:37:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.9 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 7136ec903c..2a10ef39c0 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.102 2005/04/25 01:30:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.103 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 bb93e2367d..fb1cbc3d59 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.70 2005/03/16 21:38:07 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.71 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 a0de4db74d..6daadfd0b8 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.16 2005/03/16 21:38:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.17 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 de3187e247..5bed87aea9 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.68 2005/04/06 16:34:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.69 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 10ffddd5cd..b00a572e14 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.46 2005/03/16 21:38:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.47 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 71a4392a9a..22619930b2 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.139 2005/05/02 00:37:06 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.140 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 0a398849f8..a6a780f477 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.179 2005/04/25 03:58:29 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.180 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 13711b2241..abe0aa060c 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.120 2005/04/14 20:03:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.121 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 7c24e648af..c012650a57 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.221 2005/04/14 20:32:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.222 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 ac0fe7a100..deedd53bd3 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -78,7 +78,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.47 2005/03/22 20:13:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.48 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 eaad3c612e..1c00e06371 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -36,7 +36,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplestore.c,v 1.21 2004/12/31 22:02:53 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/sort/tuplestore.c,v 1.22 2005/05/06 17:24:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 27471d6afb..d92d242cbd 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/tupmacs.h,v 1.27 2004/12/31 22:03:21 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/access/tupmacs.h,v 1.28 2005/05/06 17:24:55 tgl Exp $ * *------------------------------------------------------------------------- */ #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 e4c2f4d587..03a54bd179 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -33,7 +33,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.72 2005/05/01 18:56:19 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.73 2005/05/06 17:24:55 tgl Exp $ * **********************************************************************/ @@ -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 62b793c5f4..b4cd6d1fdd 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.88 2005/04/14 20:03:27 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.89 2005/05/06 17:24:55 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -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 1b42e8bd44..18bcd4fe2e 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.137 2005/05/02 00:37:07 neilc Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.138 2005/05/06 17:24:55 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -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 27310feda8..b749e02f87 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.61 2005/05/02 00:37:07 neilc Exp $ + * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.62 2005/05/06 17:24:55 tgl Exp $ * ********************************************************************* */ @@ -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 5649a9b8c4..98cc0cf832 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -31,7 +31,7 @@ * ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.96 2005/05/01 18:56:19 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.97 2005/05/06 17:24:55 tgl Exp $ * **********************************************************************/ @@ -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"