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

Commit 7385619

Browse files
scrappyscrappy
committed
Clean it up so that it compiles
1 parent 33a8df7 commit 7385619

File tree

15 files changed

+241
-350
lines changed

15 files changed

+241
-350
lines changed

‎src/backend/commands/_deadcode/version.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.2 1996/11/03 23:57:42 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.3 1996/11/06 08:21:42 scrappy Exp $
1414
*
1515
* NOTES
1616
* At the point the version is defined, 2 physical relations are created
@@ -24,13 +24,13 @@
2424
#include <stdio.h>
2525
#include <string.h>
2626

27-
#include "postgres.h"
27+
#include <postgres.h>
2828

29-
#include "access/heapam.h"
30-
#include "utils/builtins.h"
31-
#include "commands/version.h"
32-
#include "access/xact.h" /* for GetCurrentXactStartTime */
33-
#include "tcop/tcopprot.h"
29+
#include <access/heapam.h>
30+
#include <utils/builtins.h>
31+
#include <commands/version.h>
32+
#include <access/xact.h> /* for GetCurrentXactStartTime */
33+
#include <tcop/tcopprot.h>
3434

3535
#define MAX_QUERY_LEN 1024
3636

‎src/backend/commands/async.c

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.5 1996/11/03 23:57:19 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.6 1996/11/06 08:21:26 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -58,36 +58,28 @@
5858
* #4,#5 are changing soon with pending rewrite of portal/protocol.
5959
*
6060
*/
61-
62-
#include "postgres.h"
63-
64-
#include "utils/syscache.h"
65-
#include "access/relscan.h"
66-
#include "access/xact.h"
67-
#include "lib/dllist.h"
68-
#include "utils/palloc.h"
69-
70-
#include "tcop/dest.h"
71-
#include "catalog/pg_proc.h"
72-
#include "catalog/catname.h"
73-
#include "catalog/pg_listener.h"
74-
75-
#include "access/heapam.h"
76-
77-
#include "storage/bufmgr.h"
78-
79-
#include "nodes/memnodes.h"
80-
#include "utils/mcxt.h"
81-
#include "commands/async.h"
82-
8361
#include <unistd.h>
8462
#include <signal.h>
8563
#include <string.h>
8664
#include <errno.h>
87-
8865
#include <netinet/in.h>
89-
#include "libpq/libpq.h"
9066

67+
#include <postgres.h>
68+
69+
#include <utils/syscache.h>
70+
#include <access/relscan.h>
71+
#include <access/xact.h>
72+
#include <lib/dllist.h>
73+
#include <tcop/dest.h>
74+
#include <catalog/pg_proc.h>
75+
#include <catalog/catname.h>
76+
#include <catalog/pg_listener.h>
77+
#include <access/heapam.h>
78+
#include <storage/bufmgr.h>
79+
#include <nodes/memnodes.h>
80+
#include <utils/mcxt.h>
81+
#include <commands/async.h>
82+
#include <libpq/libpq.h>
9183

9284
static int notifyFrontEndPending = 0;
9385
static int notifyIssued = 0;

‎src/backend/commands/cluster.c

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,37 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.7 1996/11/03 23:57:20 scrappy Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.8 1996/11/06 08:21:29 scrappy Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
21-
#include <string.h>
22-
#include <stdio.h>
23-
24-
#include "postgres.h"
25-
26-
#include "access/heapam.h"
27-
#include "access/genam.h"
28-
#include "access/htup.h"
29-
#include "access/skey.h"
30-
#include "access/xact.h"
31-
32-
#include "catalog/catname.h"
33-
#include "utils/syscache.h"
34-
#include "catalog/index.h"
35-
#include "catalog/indexing.h"
36-
#include "catalog/pg_type.h"
37-
38-
#include "commands/copy.h"
39-
#include "commands/cluster.h"
40-
#include "commands/rename.h"
41-
42-
#include "storage/bufmgr.h"
43-
44-
#include "miscadmin.h"
45-
#include "tcop/dest.h"
46-
#include "commands/command.h"
47-
48-
#include "utils/builtins.h"
49-
#include "utils/excid.h"
50-
#include "utils/mcxt.h"
51-
#include "utils/palloc.h"
52-
53-
#include "catalog/pg_proc.h"
54-
#include "catalog/pg_class.h"
55-
56-
#include "optimizer/internal.h"
57-
21+
#include <postgres.h>
22+
23+
#include <catalog/pg_index.h>
24+
#include <catalog/heap.h>
25+
#include <access/heapam.h>
26+
#include <access/genam.h>
27+
#include <access/xact.h>
28+
#include <catalog/catname.h>
29+
#include <utils/syscache.h>
30+
#include <catalog/index.h>
31+
#include <catalog/indexing.h>
32+
#include <catalog/pg_type.h>
33+
#include <commands/copy.h>
34+
#include <commands/cluster.h>
35+
#include <commands/rename.h>
36+
#include <storage/bufmgr.h>
37+
#include <miscadmin.h>
38+
#include <tcop/dest.h>
39+
#include <commands/command.h>
40+
#include <utils/builtins.h>
41+
#include <utils/excid.h>
42+
#include <utils/mcxt.h>
43+
#include <catalog/pg_proc.h>
44+
#include <catalog/pg_class.h>
45+
#include <optimizer/internal.h>
5846
#ifndef NO_SECURITY
59-
#include "utils/acl.h"
60-
#include "utils/syscache.h"
47+
#include <utils/acl.h>
6148
#endif /* !NO_SECURITY */
6249

6350
/*

‎src/backend/commands/command.c

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4 1996/11/03 23:57:21 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.5 1996/11/06 08:21:30 scrappy Exp $
1111
*
1212
* NOTES
1313
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,53 +20,25 @@
2020
*
2121
*-------------------------------------------------------------------------
2222
*/
23-
#include "postgres.h"
23+
#include <postgres.h>
2424

25-
#include "access/relscan.h"
26-
27-
#include "nodes/memnodes.h"
28-
#include "nodes/parsenodes.h"
29-
#include "nodes/params.h"
30-
#include "access/sdir.h"
31-
#include "executor/hashjoin.h"
32-
#include "executor/tuptable.h"
33-
#include "access/funcindex.h"
34-
#include "nodes/execnodes.h"
35-
#include "nodes/plannodes.h"
36-
#include "tcop/dest.h"
37-
#include "executor/execdesc.h"
38-
#include "utils/portal.h"
39-
40-
#include "commands/command.h"
41-
42-
#include "utils/mcxt.h"
43-
44-
#include "executor/executor.h"
45-
46-
#include "executor/execdefs.h"
47-
48-
#include "catalog/indexing.h"
49-
50-
#include "utils/syscache.h"
51-
52-
#include "catalog/catalog.h"
53-
54-
#include "access/heapam.h"
55-
56-
#include "utils/array.h"
57-
#include "utils/acl.h"
58-
59-
#include "optimizer/prep.h"
60-
61-
#include "catalog/catname.h"
62-
63-
#include "catalog/pg_proc.h"
64-
65-
#include "utils/palloc.h"
66-
67-
#include "catalog/pg_type.h"
68-
69-
#include "utils/builtins.h"
25+
#include <access/relscan.h>
26+
#include <utils/portal.h>
27+
#include <commands/command.h>
28+
#include <utils/mcxt.h>
29+
#include <executor/executor.h>
30+
#include <executor/execdefs.h>
31+
#include <catalog/indexing.h>
32+
#include <utils/syscache.h>
33+
#include <catalog/catalog.h>
34+
#include <access/heapam.h>
35+
#include <utils/array.h>
36+
#include <utils/acl.h>
37+
#include <optimizer/prep.h>
38+
#include <catalog/catname.h>
39+
#include <catalog/pg_proc.h>
40+
#include <catalog/pg_type.h>
41+
#include <utils/builtins.h>
7042

7143
/* ----------------
7244
* PortalExecutorHeapMemory stuff

‎src/backend/commands/copy.c

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,32 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.13 1996/11/06 06:47:09 scrappy Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.14 1996/11/06 08:21:31 scrappy Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

14+
#include <string.h>
15+
#include <unistd.h>
16+
1417
#include <postgres.h>
1518

1619
#include <access/heapam.h>
17-
18-
#include <stdio.h>
19-
2020
#include <tcop/dest.h>
21-
2221
#include <fmgr.h>
23-
24-
#include <utils/palloc.h>
25-
2622
#include <miscadmin.h>
27-
2823
#include <utils/builtins.h>
29-
3024
#include <utils/acl.h>
31-
3225
#include <sys/stat.h>
33-
3426
#include <catalog/pg_index.h>
35-
3627
#include <utils/syscache.h>
37-
38-
#include <nodes/params.h>
39-
#include <executor/hashjoin.h>
40-
#include <nodes/primnodes.h>
41-
#include <nodes/memnodes.h>
42-
#include <executor/tuptable.h>
43-
#include <nodes/execnodes.h>
44-
4528
#include <utils/memutils.h>
46-
4729
#include <executor/executor.h>
48-
4930
#include <access/transam.h>
50-
5131
#include <catalog/index.h>
52-
5332
#include <access/genam.h>
54-
5533
#include <catalog/pg_type.h>
56-
5734
#include <catalog/catname.h>
58-
5935
#include <catalog/pg_user.h>
6036

6137
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))

‎src/backend/commands/creatinh.c

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,25 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.3 1996/11/03 23:57:25 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.4 1996/11/06 08:21:32 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include "postgres.h"
15-
16-
#include "utils/rel.h"
17-
#include "nodes/parsenodes.h"
18-
19-
#include "catalog/heap.h"
20-
21-
#include "utils/palloc.h"
22-
23-
#include "commands/creatinh.h"
24-
25-
#include "access/xact.h"
26-
27-
#include "access/heapam.h"
28-
29-
#include "utils/syscache.h"
30-
31-
#include "catalog/catname.h"
32-
33-
#include "catalog/pg_type.h"
34-
35-
#include "catalog/pg_inherits.h"
36-
3714
#include <stdio.h>
3815

39-
#include "catalog/pg_ipl.h"
16+
#include <postgres.h>
17+
18+
#include <utils/rel.h>
19+
#include <nodes/parsenodes.h>
20+
#include <catalog/heap.h>
21+
#include <commands/creatinh.h>
22+
#include <access/xact.h>
23+
#include <access/heapam.h>
24+
#include <utils/syscache.h>
25+
#include <catalog/catname.h>
26+
#include <catalog/pg_type.h>
27+
#include <catalog/pg_inherits.h>
28+
#include <catalog/pg_ipl.h>
4029

4130
/* ----------------
4231
* local stuff

0 commit comments

Comments
 (0)