Skip to content

Commit 0c960e7

Browse files
scrappyscrappy
committed
More include file cleanups
1 parent 4bdf308 commit 0c960e7

File tree

16 files changed

+35
-92
lines changed

16 files changed

+35
-92
lines changed

‎src/backend/access/common/heaptuple.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.12 1996/11/01 09:41:35 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.13 1996/11/03 08:16:44 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -21,9 +21,7 @@
2121

2222
#include "access/htup.h"
2323
#include "access/transam.h"
24-
#include "access/tupdesc.h"
2524
#include "access/tupmacs.h"
26-
#include "storage/buf.h"
2725
#include "storage/bufpage.h"
2826
#include "utils/memutils.h"
2927
#include "utils/palloc.h"

‎src/backend/access/common/heapvalid.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,18 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.9 1996/11/01 09:41:37 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.10 1996/11/03 08:16:46 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

17-
#include "access/htup.h"
18-
#include "utils/rel.h"
19-
#include "access/tupdesc.h"
20-
2117
#include "fmgr.h"
22-
#include "catalog/pg_attribute.h"
23-
#include "storage/buf.h"
24-
#include "storage/item.h"
25-
#include "storage/itemid.h"
26-
#include "storage/page.h"
27-
18+
#include "access/heaptuple.h"
2819
#include "access/xact.h"
2920
#include "storage/bufpage.h"
30-
31-
#include "access/heaptuple.h"
21+
#include "utils/rel.h"
3222
#include "utils/tqual.h"
3323

3424
/* ----------------

‎src/backend/access/common/indextuple.c

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,20 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.8 1996/11/01 09:41:37 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.9 1996/11/03 08:16:47 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include <string.h>
17-
1816
#include "postgres.h"
19-
#include "access/htup.h"
20-
#include "utils/rel.h"
21-
22-
#include "access/tupmacs.h"
23-
#include "catalog/pg_attribute.h"
24-
#include "storage/buf.h"
25-
#include "utils/memutils.h"
26-
#include "utils/palloc.h"
2717

18+
#include "access/heapam.h"
2819
#include "access/ibit.h"
29-
#include "access/tupdesc.h"
30-
3120
#include "access/itup.h"
32-
33-
#include "utils/tqual.h"
34-
3521
#include "access/relscan.h"
22+
#include "access/tupmacs.h"
23+
#include "utils/palloc.h"
3624

37-
#include "access/heapam.h"
3825

3926
static Size IndexInfoFindDataOffset(unsigned short t_info);
4027

‎src/backend/access/common/indexvalid.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,17 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.9 1996/11/01 09:41:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.10 1996/11/03 08:16:48 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include "postgres.h"
1616

1717
#include "access/htup.h"
18-
#include "access/tupdesc.h"
19-
20-
#include "executor/execdebug.h"
21-
22-
#include "access/skey.h"
23-
2418
#include "access/itup.h"
25-
19+
#include "access/skey.h"
20+
#include "executor/execdebug.h"
2621

2722
/* ----------------------------------------------------------------
2823
* index scan key qualification code

‎src/backend/access/common/printtup.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,24 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.7 1996/11/01 09:41:39 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.8 1996/11/03 08:16:49 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include <stdio.h>
17-
#include <sys/types.h>
18-
#include <netinet/in.h>
19-
2016
#include "postgres.h"
2117

22-
#include "access/htup.h"
18+
#include "access/heaptuple.h"
2319
#include "utils/rel.h"
24-
#include "access/tupdesc.h"
20+
#include "utils/palloc.h"
2521

2622
#include "fmgr.h"
2723
#include "libpq/pqcomm.h"
28-
#include "storage/buf.h"
29-
#include "utils/palloc.h"
3024

3125
#include "libpq/libpq.h"
3226

3327
#include "catalog/pg_type.h"
3428
#include "utils/syscache.h"
35-
#include "access/heaptuple.h"
3629

3730
/* ----------------------------------------------------------------
3831
* printtup / debugtup support

‎src/backend/access/common/scankey.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.6 1996/11/01 09:41:40 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.7 1996/11/03 08:16:50 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,7 +16,6 @@
1616

1717
#include "fmgr.h"
1818
#include "access/attnum.h"
19-
2019
#include "access/skey.h"
2120

2221
/*

‎src/backend/access/common/tupdesc.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.7 1996/11/01 09:41:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.8 1996/11/03 08:16:51 scrappy Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -16,15 +16,10 @@
1616
*-------------------------------------------------------------------------
1717
*/
1818

19-
#include <string.h>
20-
#include <stdio.h>
21-
#include <time.h>
22-
2319
#include "postgres.h"
2420

2521
#include "access/htup.h"
2622
#include "utils/rel.h"
27-
#include "access/tupdesc.h"
2823

2924
#include "utils/fcache.h"
3025
#include "utils/geo-decls.h"

‎src/include/access/heapam.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: heapam.h,v 1.3 1996/10/31 09:46:37 scrappy Exp $
9+
* $Id: heapam.h,v 1.4 1996/11/03 08:17:18 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef HEAPAM_H
1414
#define HEAPAM_H
1515

16-
#include <sys/types.h>
17-
18-
19-
#include "access/attnum.h"
20-
#include "access/htup.h"
2116
#include "access/relscan.h"
22-
#include "access/skey.h"
23-
#include "utils/tqual.h"
24-
#include "access/tupdesc.h"
25-
#include "storage/smgr.h"
26-
#include "utils/rel.h"
17+
#include "storage/buf.h"
2718

2819
/* ----------------------------------------------------------------
2920
* heap access method statistics

‎src/include/access/heaptuple.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: heaptuple.h,v 1.1 1996/10/18 17:58:33 scrappy Exp $
9+
* $Id: heaptuple.h,v 1.2 1996/11/03 08:17:19 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef HEAPTUPLE_H
1414
#define HEAPTUPLE_H
1515

16+
#include "access/htup.h"
17+
#include "storage/buf.h"
18+
#include "access/tupdesc.h"
19+
1620
extern char *heap_getattr(HeapTuple tup,
1721
Buffer b,
1822
int attnum,

‎src/include/access/ibit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: ibit.h,v 1.2 1996/10/19 04:09:32 scrappy Exp $
9+
* $Id: ibit.h,v 1.3 1996/11/03 08:17:20 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef IBIT_H
1414
#define IBIT_H
1515

16-
#include "utils/memutils.h"
16+
#include "utils/memutils.h"
1717

1818
typedef struct IndexAttributeBitMapData {
1919
char bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1)

‎src/include/access/itup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: itup.h,v 1.2 1996/10/19 04:08:58 scrappy Exp $
9+
* $Id: itup.h,v 1.3 1996/11/03 08:17:21 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef ITUP_H
1414
#define ITUP_H
1515

1616
#include "storage/itemptr.h"
17-
#include "access/tupdesc.h"
17+
#include "access/tupdesc.h"
1818

1919
#define MaxIndexAttributeNumber 7
2020

‎src/include/access/relscan.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: relscan.h,v 1.3 1996/10/23 07:41:30 scrappy Exp $
9+
* $Id: relscan.h,v 1.4 1996/11/03 08:17:22 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef RELSCAN_H
1414
#define RELSCAN_H
1515

16-
#include "utils/tqual.h"
1716
#include "utils/rel.h"
18-
#include "storage/buf.h"
17+
#include "utils/tqual.h"
18+
#include "storage/buf.h"
1919

2020
typedef ItemPointerData MarkData;
2121

‎src/include/access/xact.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: xact.h,v 1.1 1996/08/27 21:50:29 scrappy Exp $
9+
* $Id: xact.h,v 1.2 1996/11/03 08:17:23 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef XACT_H
1414
#define XACT_H
1515

16-
#include <signal.h>
17-
18-
#include "storage/ipc.h"
19-
#include "miscadmin.h"
20-
#include "utils/portal.h"
21-
#include "utils/elog.h"
22-
#include "utils/mcxt.h"
2316
#include "utils/nabstime.h"
2417

2518
/* ----------------

‎src/include/nodes/memnodes.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: memnodes.h,v 1.2 1996/10/19 06:27:27 scrappy Exp $
9+
* $Id: memnodes.h,v 1.3 1996/11/03 08:17:27 scrappy Exp $
1010
*
1111
* XXX the typedefs in this file are different from the other ???nodes.h;
1212
* they are pointers to structures instead of the structures themselves.
@@ -18,6 +18,7 @@
1818
#ifndef MEMNODES_H
1919
#define MEMNODES_H
2020

21+
#include "nodes/nodes.h"
2122
#include "utils/memutils.h"
2223
#include "lib/fstack.h"
2324

‎src/include/utils/mcxt.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: mcxt.h,v 1.2 1996/10/31 09:51:24 scrappy Exp $
9+
* $Id: mcxt.h,v 1.3 1996/11/03 08:17:34 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndef MCXT_H
1414
#define MCXT_H
1515

16-
1716
#include "nodes/memnodes.h"
18-
#include "nodes/nodes.h"
1917

2018
extern MemoryContext CurrentMemoryContext;
2119
extern MemoryContext TopMemoryContext;

‎src/include/utils/tqual.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: tqual.h,v 1.3 1996/10/23 07:42:13 scrappy Exp $
9+
* $Id: tqual.h,v 1.4 1996/11/03 08:17:38 scrappy Exp $
1010
*
1111
* NOTE
1212
* It may be desirable to allow time qualifications to indicate
@@ -17,7 +17,6 @@
1717
#ifndef TQUAL_H
1818
#define TQUAL_H
1919

20-
#include "utils/nabstime.h"
2120
#include "access/htup.h"
2221

2322
typedef struct TimeQualSpace {

0 commit comments

Comments
 (0)