Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd1e9a76

Browse files
committed
Another run through.
This gets us a clean compile of 'common' and 'gist' with *clean* #includefiles
1 parent1c3a776 commitd1e9a76

File tree

10 files changed

+34
-44
lines changed

10 files changed

+34
-44
lines changed

‎src/include/access/genam.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $
9+
* $Id: genam.h,v 1.4 1996/11/05 08:18:09 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefGENAM_H
1414
#defineGENAM_H
1515

16-
#include"access/itup.h"
17-
#include"access/relscan.h"
18-
#include"access/sdir.h"
19-
#include"access/funcindex.h"
16+
#include<access/sdir.h>
17+
#include<access/funcindex.h>
18+
#include<access/relscan.h>
19+
#include<access/itup.h>
2020

2121
/* ----------------
2222
*generalized index_ interface routines

‎src/include/access/gist.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#ifndefGIST_H
1313
#defineGIST_H
1414

15-
#include"storage/off.h"
16-
#include"utils/rel.h"
17-
#include"storage/block.h"
18-
#include"storage/page.h"
15+
#include<storage/page.h>
16+
#include<storage/block.h>
17+
#include<utils/rel.h>
18+
#include<storage/off.h>
1919

2020
/*
2121
** You can have as many strategies as you please in GiSTs, as

‎src/include/access/gistscan.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
*/
1212
#ifndefGISTSCAN_H
1313

14-
#include"utils/rel.h"
15-
#include"storage/block.h"
16-
#include"storage/off.h"
14+
#include<storage/off.h>
15+
#include<storage/block.h>
16+
#include<utils/rel.h>
1717

1818
voidgistadjscans(Relationr,intop,BlockNumberblkno,OffsetNumberoffnum);
1919

‎src/include/access/giststrat.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
#ifndefGISTSTRAT_H
1313
#defineGISTSTRAT_H
1414

15+
#include<access/strat.h>
16+
#include<utils/rel.h>
17+
1518
StrategyNumber
1619
RelationGetGISTStrategy(Relationr,AttrNumberattnum,RegProcedureproc);
1720

‎src/include/access/istrat.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: istrat.h,v 1.2 1996/10/31 09:46:41 scrappy Exp $
9+
* $Id: istrat.h,v 1.3 1996/11/05 08:18:13 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefISTRAT_H
1414
#defineISTRAT_H
1515

16-
#include"access/attnum.h"
17-
#include"access/skey.h"
18-
#include"access/strat.h"
19-
#include"utils/rel.h"/* for Relation */
2016

2117
/*
2218
* StrategyNumberIsValid --

‎src/include/access/rtree.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: rtree.h,v 1.1 1996/08/27 21:50:21 scrappy Exp $
9+
* $Id: rtree.h,v 1.2 1996/11/05 08:18:14 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefRTREE_H
1414
#defineRTREE_H
1515

16+
#include<access/skey.h>
17+
#include<storage/block.h>
18+
#include<storage/off.h>
19+
1620
/* see rtstrat.c for what all this is about */
1721
#defineRTNStrategies8
1822
#defineRTLeftStrategyNumber1

‎src/include/catalog/index.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: index.h,v 1.2 1996/11/03 12:12:28 scrappy Exp $
9+
* $Id: index.h,v 1.3 1996/11/05 08:18:24 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefINDEX_H
1414
#defineINDEX_H
1515

16-
#include"nodes/execnodes.h"
17-
#include"access/htup.h"
18-
#include"access/itup.h"
19-
#include"nodes/parsenodes.h"
20-
#include"storage/buf.h"
16+
#include<nodes/execnodes.h>
17+
#include<nodes/parsenodes.h>
18+
#include<access/itup.h>
19+
#include<access/funcindex.h>
2120

2221
externForm_pg_am
2322
AccessMethodObjectIdGetAccessMethodTupleForm(OidaccessMethodObjectId);

‎src/include/executor/execdesc.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: execdesc.h,v 1.2 1996/11/04 12:11:40 scrappy Exp $
10+
* $Id: execdesc.h,v 1.3 1996/11/05 08:18:31 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -17,7 +17,6 @@
1717
#include<tcop/dest.h>
1818
#include<nodes/plannodes.h>
1919
#include<nodes/parsenodes.h>
20-
#include<nodes/nodes.h>
2120

2221
/* ----------------
2322
*query descriptor:

‎src/include/executor/executor.h‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,22 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: executor.h,v 1.3 1996/11/03 12:12:39 scrappy Exp $
9+
* $Id: executor.h,v 1.4 1996/11/05 08:18:34 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefEXECUTOR_H
1414
#defineEXECUTOR_H
1515

16+
#include<catalog/pg_index.h>
17+
#include<access/itup.h>
18+
#include<stdio.h>
19+
#include<executor/execdesc.h>
20+
1621
/* ----------------------------------------------------------------
17-
* #includes
1822
* ----------------------------------------------------------------
1923
*/
2024

21-
#include<stdio.h>
22-
23-
#include"access/itup.h"
24-
#include"access/relscan.h"
25-
#include"access/skey.h"
26-
#include"access/sdir.h"
27-
#include"catalog/pg_index.h"
28-
#include"executor/execdesc.h"
29-
30-
#ifndefHAVE_MEMMOVE
31-
# include"regex/utils.h"
32-
#else
33-
# include<string.h>
34-
#endif
3525

3626
/*
3727
* prototypes from functions in execAmi.c

‎src/include/nodes/plannodes.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: plannodes.h,v 1.4 1996/11/04 12:11:44 scrappy Exp $
9+
* $Id: plannodes.h,v 1.5 1996/11/05 08:18:44 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
#ifndefPLANNODES_H
1414
#definePLANNODES_H
1515

1616
#include<nodes/execnodes.h>
17-
#include<nodes/nodes.h>
1817

1918
/* ----------------------------------------------------------------
2019
* Executor State types are used in the plannode structures

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp