Skip to content

Commit 0cf1b79

Browse files
bmomjianbmomjian
committed
Cleanup of /include #include's, for 6.6 only.
1 parent ad49488 commit 0cf1b79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+143
-109
lines changed

‎src/backend/access/hash/hashscan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.17 1999/02/13 23:14:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.18 1999/07/14 01:19:36 momjian Exp $
1111
*
1212
* NOTES
1313
* Because we can be doing an index scan on a relation while we
@@ -30,6 +30,7 @@
3030
#include <postgres.h>
3131

3232
#include <access/hash.h>
33+
#include <utils/mcxt.h>
3334

3435
static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
3536
static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);

‎src/backend/access/hash/hashutil.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.15 1999/02/13 23:14:21 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.16 1999/07/14 01:19:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,6 +18,7 @@
1818
#include <fmgr.h>
1919
#include <utils/memutils.h>
2020
#include <access/iqual.h>
21+
#include <utils/mcxt.h>
2122

2223
#ifndef HAVE_MEMMOVE
2324
#include <regex/utils.h>

‎src/backend/access/heap/heapam.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.46 1999/07/09 04:51:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.47 1999/07/14 01:19:37 momjian Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -88,6 +88,8 @@
8888
#include <access/xact.h>
8989
#include <utils/inval.h>
9090
#include <utils/memutils.h>
91+
#include <utils/builtins.h>
92+
#include <utils/mcxt.h>
9193

9294
#ifndef HAVE_MEMMOVE
9395
#include <regex/utils.h>

‎src/backend/access/index/indexam.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.30 1999/02/13 23:14:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.31 1999/07/14 01:19:38 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* index_open - open an index relation by relationId
@@ -70,6 +70,7 @@
7070
#include <fmgr.h>
7171
#include <storage/lmgr.h>
7272
#include <access/heapam.h>
73+
#include <utils/mcxt.h>
7374

7475
/* ----------------
7576
* undefine macros we aren't going to use that would otherwise

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.42 1999/05/25 22:04:11 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.43 1999/07/14 01:19:39 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,6 +20,7 @@
2020
#include <access/heapam.h>
2121
#include <access/xact.h>
2222
#include <fmgr.h>
23+
#include <utils/mcxt.h>
2324

2425
#ifndef HAVE_MEMMOVE
2526
#include <regex/utils.h>

‎src/backend/access/nbtree/nbtpage.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.24 1999/06/07 14:28:22 vadim Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.25 1999/07/14 01:19:41 momjian Exp $
1212
*
1313
* NOTES
1414
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -28,6 +28,7 @@
2828
#include <access/nbtree.h>
2929
#include <miscadmin.h>
3030
#include <storage/lmgr.h>
31+
#include <utils/mcxt.h>
3132

3233
#ifndef HAVE_MEMMOVE
3334
#include <regex/utils.h>

‎src/backend/access/nbtree/nbtscan.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.23 1999/05/25 22:04:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.24 1999/07/14 01:19:41 momjian Exp $
1111
*
1212
*
1313
* NOTES
@@ -31,6 +31,7 @@
3131

3232
#include <storage/bufpage.h>
3333
#include <access/nbtree.h>
34+
#include <utils/mcxt.h>
3435

3536
typedef struct BTScanListData
3637
{

‎src/backend/access/nbtree/nbtsearch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.45 1999/05/25 18:20:30 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.46 1999/07/14 01:19:41 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -19,6 +19,7 @@
1919
#include <storage/bufpage.h>
2020
#include <access/nbtree.h>
2121
#include <catalog/pg_proc.h>
22+
#include <utils/mcxt.h>
2223

2324
#ifndef HAVE_MEMMOVE
2425
#include <regex/utils.h>

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*
77
* IDENTIFICATION
8-
* $Id: nbtsort.c,v 1.40 1999/05/25 18:20:31 vadim Exp $
8+
* $Id: nbtsort.c,v 1.41 1999/07/14 01:19:42 momjian Exp $
99
*
1010
* NOTES
1111
*
@@ -54,6 +54,7 @@
5454
#include "access/nbtree.h"
5555
#include "storage/bufpage.h"
5656
#include "utils/memutils.h"
57+
#include "utils/mcxt.h"
5758

5859
#ifndef HAVE_MEMMOVE
5960
#include <regex/utils.h>

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.27 1999/05/25 18:20:31 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.28 1999/07/14 01:19:43 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,6 +21,7 @@
2121
#include "executor/execdebug.h"
2222
#include "fmgr.h"
2323
#include "storage/bufpage.h"
24+
#include "utils/mcxt.h"
2425

2526
extern int NIndexTupleProcessed;
2627

‎src/backend/access/rtree/rtget.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.13 1999/02/13 23:14:41 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.14 1999/07/14 01:19:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,6 +20,8 @@
2020
#include <access/iqual.h>
2121
#include <access/rtree.h>
2222
#include <storage/bufpage.h>
23+
#include <utils/mcxt.h>
24+
2325
#ifndef HAVE_MEMMOVE
2426
#include <regex/utils.h>
2527
#else

‎src/backend/access/rtree/rtproc.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.18 1999/02/13 23:14:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.19 1999/07/14 01:19:44 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,6 +16,8 @@
1616

1717
#include <utils/builtins.h>
1818
#include <utils/geo_decls.h>
19+
#include <utils/mcxt.h>
20+
1921
#ifndef HAVE_MEMMOVE
2022
#include <regex/utils.h>
2123
#else

‎src/backend/access/rtree/rtscan.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.23 1999/05/25 16:07:40 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.24 1999/07/14 01:19:45 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,6 +20,8 @@
2020
#include <storage/bufpage.h>
2121
#include <access/rtree.h>
2222
#include <access/rtstrat.h>
23+
#include <utils/mcxt.h>
24+
2325
#ifndef HAVE_MEMMOVE
2426
#include <regex/utils.h>
2527
#else

‎src/backend/access/transam/xid.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: xid.c,v 1.22 1999/05/25 16:07:52 momjian Exp $
8+
* $Id: xid.c,v 1.23 1999/07/14 01:19:45 momjian Exp $
99
*
1010
* OLD COMMENTS
1111
* XXX WARNING
@@ -22,6 +22,7 @@
2222

2323
#include <postgres.h>
2424
#include <access/xact.h>
25+
#include <utils/mcxt.h>
2526

2627
extern TransactionId NullTransactionId;
2728
extern TransactionId DisabledTransactionId;

‎src/backend/lib/stringinfo.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: stringinfo.c,v 1.17 1999/05/26 12:55:14 momjian Exp $
11+
* $Id: stringinfo.c,v 1.18 1999/07/14 01:19:46 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -18,6 +18,7 @@
1818

1919
#include "postgres.h"
2020
#include "lib/stringinfo.h"
21+
#include "utils/mcxt.h"
2122

2223
#ifdef NOT_USED
2324
/*

‎src/backend/libpq/crypt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Dec 17, 1997 - Todd A. Brandys
1010
* Orignal Version Completed.
1111
*
12-
* $Id: crypt.c,v 1.18 1999/05/27 04:09:45 momjian Exp $
12+
* $Id: crypt.c,v 1.19 1999/07/14 01:19:47 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -24,6 +24,7 @@
2424
#include "utils/nabstime.h"
2525
#include "storage/fd.h"
2626
#include "libpq/crypt.h"
27+
#include "utils/mcxt.h"
2728

2829
#ifdef HAVE_CRYPT_H
2930
#include <crypt.h>

‎src/backend/nodes/list.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.21 1999/05/25 16:09:08 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.22 1999/07/14 01:19:49 momjian Exp $
1111
*
1212
* NOTES
1313
* XXX a few of the following functions are duplicated to handle
@@ -28,6 +28,7 @@
2828
#include "utils/builtins.h" /* for namecpy */
2929
#include "utils/elog.h"
3030
#include "utils/palloc.h"
31+
#include "utils/mcxt.h"
3132

3233
/*
3334
* makeList

‎src/backend/nodes/nodes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.7 1999/02/13 23:15:59 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.8 1999/07/14 01:19:50 momjian Exp $
1212
*
1313
* HISTORY
1414
* Andrew Yu Oct 20, 1994 file creation
@@ -19,8 +19,8 @@
1919
#include "postgres.h"
2020
#include "utils/palloc.h"
2121
#include "utils/elog.h"
22-
#include "nodes/nodes.h" /* where func declarations of this file
23-
* goes */
22+
#include "nodes/nodes.h"
23+
#include "utils/mcxt.h"
2424

2525
/*
2626
* newNode -

‎src/backend/optimizer/geqo/geqo_erx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* geqo_erx.c
44
* edge recombination crossover [ER]
55
*
6-
* $Id: geqo_erx.c,v 1.11 1999/02/13 23:16:06 momjian Exp $
6+
* $Id: geqo_erx.c,v 1.12 1999/07/14 01:19:51 momjian Exp $
77
*
88
*-------------------------------------------------------------------------
99
*/
@@ -51,6 +51,7 @@
5151
#include "optimizer/geqo_recombination.h"
5252
#include "optimizer/geqo_random.h"
5353

54+
#include "utils/mcxt.h"
5455

5556
static int gimme_edge(Gene gene1, Gene gene2, Edge *edge_table);
5657
static void remove_gene(Gene gene, Edge edge, Edge *edge_table);

‎src/backend/optimizer/geqo/geqo_params.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: geqo_params.c,v 1.17 1999/05/22 23:27:19 tgl Exp $
8+
* $Id: geqo_params.c,v 1.18 1999/07/14 01:19:51 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -45,6 +45,8 @@
4545

4646
#include "storage/fd.h"
4747

48+
#include "utils/mcxt.h"
49+
4850
/*
4951
* Parameter values read from the config file (or defaulted) are stored here
5052
* by geqo_params().

‎src/backend/optimizer/geqo/geqo_pmx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* PMX operator according to Goldberg & Lingle
77
* (Proc Int'l Conf on GA's)
88
*
9-
* $Id: geqo_pmx.c,v 1.5 1999/02/13 23:16:11 momjian Exp $
9+
* $Id: geqo_pmx.c,v 1.6 1999/07/14 01:19:52 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -53,6 +53,7 @@
5353
#include "optimizer/geqo_recombination.h"
5454
#include "optimizer/geqo_random.h"
5555

56+
#include "utils/mcxt.h"
5657

5758
/* pmx
5859
*

‎src/backend/optimizer/geqo/geqo_pool.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
8-
* $Id: geqo_pool.c,v 1.12 1999/05/25 16:09:18 momjian Exp $
8+
* $Id: geqo_pool.c,v 1.13 1999/07/14 01:19:52 momjian Exp $
99
*
1010
*-------------------------------------------------------------------------
1111
*/
@@ -41,6 +41,7 @@
4141
#include "optimizer/geqo_copy.h"
4242
#include "optimizer/geqo_recombination.h"
4343

44+
#include "utils/mcxt.h"
4445

4546
static int compare(const void *arg1, const void *arg2);
4647

‎src/backend/optimizer/geqo/geqo_recombination.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* geqo_recombination.c
44
* misc recombination procedures
55
*
6-
* $Id: geqo_recombination.c,v 1.7 1999/02/13 23:16:12 momjian Exp $
6+
* $Id: geqo_recombination.c,v 1.8 1999/07/14 01:19:53 momjian Exp $
77
*
88
*-------------------------------------------------------------------------
99
*/
@@ -38,6 +38,7 @@
3838
#include "optimizer/geqo_recombination.h"
3939
#include "optimizer/geqo_random.h"
4040

41+
#include "utils/mcxt.h"
4142

4243
/*
4344
* init_tour

0 commit comments

Comments
 (0)