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

Commit c9002ec

Browse files
scrappyscrappy
committed
Produce a clean compile of backend...
1 parent 3cf53c1 commit c9002ec

29 files changed

+73
-75
lines changed

‎src/backend/libpq/hba.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/libpq/hba.c,v 1.4 1996/10/31 10:16:08 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.5 1996/11/03 06:52:13 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,13 +20,14 @@
2020
#include <netinet/in.h>
2121
#include <arpa/inet.h>
2222
#if defined(sparc_solaris)
23-
#include <port/inet_aton.h>
23+
#include "port/inet_aton.h"
2424
#endif
2525

26-
#include <miscadmin.h>
27-
#include <libpq/libpq.h>
28-
#include <libpq/pqcomm.h>
29-
#include <libpq/hba.h>
26+
#include "postgres.h"
27+
#include "miscadmin.h"
28+
#include "libpq/libpq.h"
29+
#include "libpq/pqcomm.h"
30+
#include "libpq/hba.h"
3031

3132

3233
#define CONF_FILE "pg_hba.conf"

‎src/backend/libpq/pqsignal.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.1.1.1 1996/07/09 06:21:31 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.2 1996/11/03 06:52:14 scrappy Exp $
1212
*
1313
* NOTES
1414
* This shouldn't be in libpq, but the monitor and some other
1515
* things need it...
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
19+
#include "postgres.h"
20+
1921
#include "libpq/pqsignal.h"
2022

2123
pqsigfunc

‎src/backend/tcop/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for tcop
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.2 1996/10/31 05:55:23 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.3 1996/11/03 06:52:27 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/tcop/aclchk.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.2 1996/10/31 05:55:24 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.3 1996/11/03 06:52:29 scrappy Exp $
1111
*
1212
* NOTES
1313
* See acl.h.
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
1717
#include <string.h>
18+
#include "postgres.h"
19+
1820
#include "utils/acl.h" /* where declarations for this file goes */
1921
#include "access/heapam.h"
2022
#include "access/htup.h"
2123
#include "access/tupmacs.h"
2224
#include "utils/builtins.h"
23-
#include "utils/elog.h"
2425
#include "utils/palloc.h"
2526
#include "catalog/indexing.h"
2627
#include "catalog/catalog.h"

‎src/backend/tcop/dest.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/tcop/dest.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.2 1996/11/03 06:52:31 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -30,7 +30,6 @@
3030
#include "libpq/libpq-be.h"
3131
#include "access/printtup.h"
3232
#include "utils/portal.h"
33-
#include "utils/elog.h"
3433
#include "utils/palloc.h"
3534

3635
#include "executor/executor.h"

‎src/backend/tcop/fastpath.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/tcop/fastpath.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.2 1996/11/03 06:52:32 scrappy Exp $
1111
*
1212
* NOTES
1313
* This cruft is the server side of PQfn.
@@ -63,7 +63,6 @@
6363

6464
#include "utils/palloc.h"
6565
#include "fmgr.h"
66-
#include "utils/elog.h"
6766
#include "utils/builtins.h" /* for oideq */
6867
#include "tcop/fastpath.h"
6968
#include "libpq/libpq.h"

‎src/backend/tcop/postgres.c

Lines changed: 2 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/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.13 1996/11/03 06:52:33 scrappy Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -65,7 +65,6 @@
6565

6666
#include "storage/bufmgr.h"
6767
#include "fmgr.h"
68-
#include "utils/elog.h"
6968
#include "utils/palloc.h"
7069
#include "utils/rel.h"
7170

@@ -1265,7 +1264,7 @@ PostgresMain(int argc, char *argv[])
12651264
*/
12661265
if (IsUnderPostmaster == false) {
12671266
puts("\nPOSTGRES backend interactive interface");
1268-
puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $");
1267+
puts("$Revision: 1.13 $ $Date: 1996/11/03 06:52:33 $");
12691268
}
12701269

12711270
/* ----------------

‎src/backend/tcop/pquery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.2 1996/07/30 07:41:38 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.3 1996/11/03 06:52:35 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include "postgres.h"
1515

1616
#include "tcop/tcopdebug.h"
1717

18-
#include "utils/elog.h"
1918
#include "utils/palloc.h"
19+
#include "nodes/nodes.h"
2020
#include "utils/mcxt.h"
2121
#include "miscadmin.h"
2222
#include "utils/portal.h"

‎src/backend/tcop/utility.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.4 1996/11/02 02:03:13 bryanh Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.5 1996/11/03 06:52:36 scrappy Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -35,7 +35,6 @@
3535

3636
#include "nodes/parsenodes.h"
3737
#include "parse.h"
38-
#include "utils/elog.h"
3938
#include "utils/builtins.h"
4039
#include "utils/acl.h"
4140
#include "utils/palloc.h"

‎src/backend/tioga/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
# Makefile for tioga
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.1 1996/10/27 09:53:00 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.2 1996/11/03 06:52:43 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

14-
INCLUDE_OPT = -I.. \
14+
INCLUDE_OPT =
1515
-I../port/$(PORTNAME) \
16-
-I../include \
1716
-I../../include
1817

1918
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/tioga/tgRecipe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.2 1996/11/03 06:52:45 scrappy Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
1818

1919
#include <stdlib.h>
20+
#include "postgres.h"
2021
#include "tioga/tgRecipe.h"
2122

2223
#include "catalog/catalog.h" /*for newoid() */

‎src/backend/utils/adt/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for utils/adt
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.1 1996/10/27 09:53:15 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.2 1996/11/03 06:52:59 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/utils/adt/acl.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,19 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.2 1996/08/27 07:32:25 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.3 1996/11/03 06:53:01 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
15-
#include "config.h"
16-
1714
#include <ctype.h>
1815
#include <string.h>
1916
#include "postgres.h"
20-
#include "c.h"
2117
#include "utils/acl.h"
2218
#include "access/htup.h"
2319
#include "catalog/pg_user.h"
2420
#include "utils/syscache.h"
25-
#include "utils/elog.h"
2621
#include "utils/palloc.h"
22+
#include "miscadmin.h"
2723

2824
static char *getid(char *s, char *n);
2925
static int32 aclitemeq(AclItem *a1, AclItem *a2);

‎src/backend/utils/adt/bool.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.2 1996/11/03 06:53:03 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14+
15+
#include "postgres.h"
16+
1417
#include "utils/builtins.h" /* where the declarations go */
15-
#include "utils/elog.h"
1618
#include "utils/palloc.h"
1719

1820
/*****************************************************************************

‎src/backend/utils/adt/dt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.2 1996/11/03 06:53:04 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include "c.h"
14+
#include "postgres.h"
1515
#include "utils/palloc.h"
1616
#include "utils/builtins.h" /* where function declarations go */
1717

‎src/backend/utils/adt/filename.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.2 1996/08/27 07:32:32 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.3 1996/11/03 06:53:05 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "config.h"
16-
1715
#include <string.h>
1816
#include <stdio.h>
1917
#ifndef WIN32
2018
#include <pwd.h>
2119
#endif /* WIN32 */
2220

2321
#include <sys/param.h>
24-
#include "utils/elog.h"
22+
23+
#include "postgres.h"
2524
#include "utils/palloc.h"
2625
#include "utils/builtins.h" /* where function declarations go */
2726

‎src/backend/utils/adt/geo-ops.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.2 1996/07/22 21:56:01 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.3 1996/11/03 06:53:06 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -16,8 +16,9 @@
1616
#include <stdio.h> /* for sprintf proto, etc. */
1717
#include <string.h>
1818

19+
#include "postgres.h"
20+
1921
#include "utils/geo-decls.h"
20-
#include "utils/elog.h"
2122
#include "utils/palloc.h"
2223

2324
#define LDELIM '('

‎src/backend/utils/adt/selfuncs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.3 1996/08/26 06:32:06 scrappy Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.4 1996/11/03 06:53:08 scrappy Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
1919
#include <stdio.h>
2020
#include <string.h>
2121

22+
#include "postgres.h"
23+
2224
#include "access/heapam.h"
2325
#include "utils/tqual.h" /* for NowTimeQual */
2426
#include "fmgr.h"
2527
#include "utils/builtins.h" /* for textout() prototype
2628
and where the declarations go */
27-
#include "utils/elog.h"
2829
#include "utils/palloc.h"
2930

3031
#include "catalog/catname.h"

‎src/backend/utils/cache/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for utils/cache
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.1 1996/10/27 09:53:26 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.2 1996/11/03 06:53:14 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)

0 commit comments

Comments
 (0)