Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 367ade1

Browse files
scrappyscrappy
committed
Remove -I../.. and -I../../include from Makefile
Add some missing include files
1 parent ea04818 commit 367ade1

File tree

9 files changed

+53
-34
lines changed

9 files changed

+53
-34
lines changed

‎src/backend/access/hash/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for access/hash
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.1 1996/10/27 09:46:08 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.2 1996/10/31 08:24:36 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../.. \
15-
-I../../port/$(PORTNAME) \
16-
-I../../include \
14+
INCLUDE_OPT = -I../../port/$(PORTNAME) \
1715
-I../../../include
1816

1917
CFLAGS+=$(INCLUDE_OPT)

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.7 1996/10/24 06:30:23 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.8 1996/10/31 08:24:37 scrappy Exp $
1111
*
1212
* NOTES
1313
* This file contains only the public interface routines.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717

18+
#include <stdio.h>
19+
#include <time.h>
20+
1821
#include "postgres.h"
1922

2023
#include "catalog/pg_attribute.h"
2124
#include "access/attnum.h"
25+
#include "nodes/nodes.h"
2226
#include "nodes/pg_list.h"
2327
#include "access/tupdesc.h"
2428
#include "storage/fd.h"
@@ -33,13 +37,13 @@
3337
#include "storage/block.h"
3438
#include "storage/off.h"
3539
#include "storage/itemptr.h"
36-
#include <time.h>
3740
#include "utils/nabstime.h"
3841
#include "access/htup.h"
3942
#include "access/itup.h"
4043
#include "storage/itemid.h"
4144
#include "storage/item.h"
4245
#include "storage/buf.h"
46+
#include "storage/page.h"
4347
#include "storage/bufpage.h"
4448
#include "access/sdir.h"
4549
#include "access/funcindex.h"
@@ -48,8 +52,12 @@
4852
#include "access/hash.h"
4953

5054
#include "nodes/params.h"
55+
#include "storage/ipc.h"
5156
#include "executor/hashjoin.h"
57+
#include "utils/fcache.h"
5258
#include "nodes/primnodes.h"
59+
#include "utils/memutils.h"
60+
#include "lib/fstack.h"
5361
#include "nodes/memnodes.h"
5462
#include "executor/tuptable.h"
5563
#include "nodes/execnodes.h"
@@ -58,7 +66,6 @@
5866
#include "nodes/parsenodes.h"
5967
#include "tcop/dest.h"
6068
#include "executor/execdesc.h"
61-
#include <stdio.h>
6269
#include "catalog/pg_index.h"
6370
#include "executor/executor.h"
6471

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.4 1996/10/21 05:45:13 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.5 1996/10/31 08:24:38 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include <stdio.h>
16+
#include <time.h>
17+
1518
#include "postgres.h"
1619

1720
#include "catalog/pg_attribute.h"
1821
#include "access/attnum.h"
22+
#include "nodes/nodes.h"
1923
#include "nodes/pg_list.h"
2024
#include "access/tupdesc.h"
2125
#include "storage/fd.h"
@@ -30,13 +34,13 @@
3034
#include "storage/block.h"
3135
#include "storage/off.h"
3236
#include "storage/itemptr.h"
33-
#include <time.h>
3437
#include "utils/nabstime.h"
3538
#include "access/htup.h"
3639
#include "access/itup.h"
3740
#include "storage/itemid.h"
3841
#include "storage/item.h"
3942
#include "storage/buf.h"
43+
#include "storage/page.h"
4044
#include "storage/bufpage.h"
4145
#include "access/sdir.h"
4246
#include "access/funcindex.h"
@@ -45,7 +49,6 @@
4549
#include "access/relscan.h"
4650
#include "access/hash.h"
4751

48-
#include <stdio.h>
4952
#include "storage/ipc.h"
5053
#include "storage/bufmgr.h"
5154

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,23 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.5 1996/10/23 07:38:32 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.6 1996/10/31 08:24:39 scrappy Exp $
1111
*
1212
* NOTES
1313
* Overflow pages look like ordinary relation pages.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717

18+
#include <stdio.h>
19+
#include <time.h>
20+
#include <string.h>
21+
1822
#include "postgres.h"
1923

2024
#include "catalog/pg_attribute.h"
2125
#include "access/attnum.h"
26+
#include "nodes/nodes.h"
2227
#include "nodes/pg_list.h"
2328
#include "access/tupdesc.h"
2429
#include "storage/fd.h"
@@ -33,26 +38,23 @@
3338
#include "storage/block.h"
3439
#include "storage/off.h"
3540
#include "storage/itemptr.h"
36-
#include <time.h>
3741
#include "utils/nabstime.h"
3842
#include "access/htup.h"
3943
#include "access/itup.h"
4044
#include "storage/itemid.h"
4145
#include "storage/item.h"
4246
#include "storage/buf.h"
47+
#include "storage/page.h"
4348
#include "storage/bufpage.h"
4449
#include "access/sdir.h"
4550
#include "access/funcindex.h"
4651
#include "utils/tqual.h"
47-
#include "storage/buf.h"
4852
#include "access/relscan.h"
4953
#include "access/hash.h"
5054

51-
#include <stdio.h>
5255
#include "storage/ipc.h"
5356
#include "storage/bufmgr.h"
5457

55-
#include <string.h>
5658

5759
#include "utils/memutils.h"
5860

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

Lines changed: 7 additions & 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/hash/hashpage.c,v 1.4 1996/10/21 05:45:15 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.5 1996/10/31 08:24:41 scrappy Exp $
1111
*
1212
* NOTES
1313
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -23,10 +23,15 @@
2323
*-------------------------------------------------------------------------
2424
*/
2525

26+
#include <stdio.h>
27+
#include <time.h>
28+
#include <string.h>
29+
2630
#include "postgres.h"
2731

2832
#include "catalog/pg_attribute.h"
2933
#include "access/attnum.h"
34+
#include "nodes/nodes.h"
3035
#include "nodes/pg_list.h"
3136
#include "access/tupdesc.h"
3237
#include "storage/fd.h"
@@ -41,31 +46,27 @@
4146
#include "storage/block.h"
4247
#include "storage/off.h"
4348
#include "storage/itemptr.h"
44-
#include <time.h>
4549
#include "utils/nabstime.h"
4650
#include "access/htup.h"
4751
#include "access/itup.h"
4852
#include "storage/itemid.h"
4953
#include "storage/item.h"
5054
#include "storage/buf.h"
55+
#include "storage/page.h"
5156
#include "storage/bufpage.h"
5257
#include "access/sdir.h"
5358
#include "access/funcindex.h"
5459
#include "utils/tqual.h"
55-
#include "storage/buf.h"
5660
#include "access/relscan.h"
5761
#include "access/hash.h"
5862

59-
#include <stdio.h>
6063
#include "storage/ipc.h"
6164
#include "storage/bufmgr.h"
6265

6366
#include "miscadmin.h"
6467

6568
#include "utils/memutils.h"
6669

67-
#include <string.h>
68-
6970
#include "storage/spin.h"
7071
#include "utils/hsearch.h"
7172
#include "storage/shmem.h"

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

Lines changed: 5 additions & 3 deletions
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.4 1996/10/21 05:45:16 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.5 1996/10/31 08:24:42 scrappy Exp $
1111
*
1212
* NOTES
1313
* Because we can be doing an index scan on a relation while we
@@ -27,10 +27,13 @@
2727
*-------------------------------------------------------------------------
2828
*/
2929

30+
#include <time.h>
31+
3032
#include "postgres.h"
3133

3234
#include "catalog/pg_attribute.h"
3335
#include "access/attnum.h"
36+
#include "nodes/nodes.h"
3437
#include "nodes/pg_list.h"
3538
#include "access/tupdesc.h"
3639
#include "storage/fd.h"
@@ -45,18 +48,17 @@
4548
#include "storage/block.h"
4649
#include "storage/off.h"
4750
#include "storage/itemptr.h"
48-
#include <time.h>
4951
#include "utils/nabstime.h"
5052
#include "access/htup.h"
5153
#include "access/itup.h"
5254
#include "storage/itemid.h"
5355
#include "storage/item.h"
5456
#include "storage/buf.h"
57+
#include "storage/page.h"
5558
#include "storage/bufpage.h"
5659
#include "access/sdir.h"
5760
#include "access/funcindex.h"
5861
#include "utils/tqual.h"
59-
#include "storage/buf.h"
6062
#include "access/relscan.h"
6163
#include "access/hash.h"
6264

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.4 1996/10/21 05:45:19 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.5 1996/10/31 08:24:43 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include <stdio.h>
16+
#include <time.h>
17+
1518
#include "postgres.h"
1619

1720
#include "catalog/pg_attribute.h"
1821
#include "access/attnum.h"
22+
#include "nodes/nodes.h"
1923
#include "nodes/pg_list.h"
2024
#include "access/tupdesc.h"
2125
#include "storage/fd.h"
@@ -30,18 +34,17 @@
3034
#include "storage/block.h"
3135
#include "storage/off.h"
3236
#include "storage/itemptr.h"
33-
#include <time.h>
3437
#include "utils/nabstime.h"
3538
#include "access/htup.h"
3639
#include "access/itup.h"
3740
#include "storage/itemid.h"
3841
#include "storage/item.h"
3942
#include "storage/buf.h"
43+
#include "storage/page.h"
4044
#include "storage/bufpage.h"
4145
#include "access/sdir.h"
4246
#include "access/funcindex.h"
4347
#include "utils/tqual.h"
44-
#include "storage/buf.h"
4548
#include "access/relscan.h"
4649
#include "access/hash.h"
4750

@@ -53,7 +56,6 @@
5356
# include <string.h>
5457
#endif
5558

56-
#include <stdio.h>
5759
#include "storage/ipc.h"
5860
#include "storage/bufmgr.h"
5961

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.4 1996/10/21 05:45:20 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.5 1996/10/31 08:24:45 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include <time.h>
16+
1517
#include "postgres.h"
1618

1719
#include "catalog/pg_attribute.h"
1820
#include "access/attnum.h"
21+
#include "nodes/nodes.h"
1922
#include "nodes/pg_list.h"
2023
#include "access/tupdesc.h"
2124
#include "storage/fd.h"
@@ -30,18 +33,17 @@
3033
#include "storage/block.h"
3134
#include "storage/off.h"
3235
#include "storage/itemptr.h"
33-
#include <time.h>
3436
#include "utils/nabstime.h"
3537
#include "access/htup.h"
3638
#include "access/itup.h"
3739
#include "storage/itemid.h"
3840
#include "storage/item.h"
3941
#include "storage/buf.h"
42+
#include "storage/page.h"
4043
#include "storage/bufpage.h"
4144
#include "access/sdir.h"
4245
#include "access/funcindex.h"
4346
#include "utils/tqual.h"
44-
#include "storage/buf.h"
4547
#include "access/relscan.h"
4648
#include "access/hash.h"
4749

0 commit comments

Comments
 (0)