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

Commit a472a29

Browse files
scrappyscrappy
committed
I'm getting there, slowly :)
1 parent e232909 commit a472a29

File tree

12 files changed

+104
-102
lines changed

12 files changed

+104
-102
lines changed

‎src/backend/libpq/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for libpq subsystem (backend half of libpq interface)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.2 1996/10/31 10:37:47 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.3 1996/11/06 08:48:21 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

14-
INCLUDE_OPT = -I../port/$(PORTNAME) \
14+
INCLUDE_OPT = -I.. \
15+
-I../port/$(PORTNAME) \
1516
-I../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/libpq/auth.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.6 1996/11/06 06:48:06 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.7 1996/11/06 08:48:23 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -62,13 +62,13 @@
6262
#include <netinet/in.h>
6363
#include <arpa/inet.h>
6464

65-
#include "postgres.h"
66-
#include "miscadmin.h"
65+
#include <postgres.h>
66+
#include <miscadmin.h>
6767

68-
#include "libpq/auth.h"
69-
#include "libpq/libpq.h"
70-
#include "libpq/libpq-be.h"
71-
#include "libpq/hba.h"
68+
#include <libpq/auth.h>
69+
#include <libpq/libpq.h>
70+
#include <libpq/libpq-be.h>
71+
#include <libpq/hba.h>
7272

7373
/*----------------------------------------------------------------
7474
* common definitions for generic fe/be routines
@@ -129,7 +129,7 @@ static n_authsvcs = sizeof(authsvcs) / sizeof(struct authsvc);
129129
*----------------------------------------------------------------
130130
*/
131131

132-
#include "krb.h"
132+
#include <krb.h>
133133

134134
#ifdef FRONTEND
135135
/* moves to src/libpq/fe-auth.c */
@@ -228,7 +228,7 @@ return(STATUS_ERROR);
228228
*----------------------------------------------------------------
229229
*/
230230

231-
#include "krb5/krb5.h"
231+
#include <krb5/krb5.h>
232232

233233
/*
234234
* pg_an_to_ln -- return the local name corresponding to an authentication

‎src/backend/libpq/be-dumpdata.c

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.2 1996/11/06 06:48:10 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.3 1996/11/06 08:48:24 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -30,25 +30,22 @@
3030
*
3131
*/
3232
#include <string.h>
33-
#include "postgres.h"
3433

35-
#include "lib/dllist.h"
36-
#include "libpq/libpq-be.h"
34+
#include <postgres.h>
3735

38-
#include "access/heapam.h"
39-
#include "access/htup.h"
40-
#include "storage/buf.h"
41-
#include "utils/memutils.h"
42-
#include "utils/palloc.h"
43-
#include "fmgr.h"
44-
#include "utils/mcxt.h"
45-
#include "utils/elog.h"
46-
#include "utils/exc.h"
47-
48-
#include "utils/syscache.h"
49-
#include "catalog/pg_type.h"
50-
#include "catalog/catalog.h"
51-
#include "access/printtup.h"
36+
#include <lib/dllist.h>
37+
#include <libpq/libpq-be.h>
38+
#include <access/heapam.h>
39+
#include <access/htup.h>
40+
#include <storage/buf.h>
41+
#include <utils/memutils.h>
42+
#include <fmgr.h>
43+
#include <utils/mcxt.h>
44+
#include <utils/exc.h>
45+
#include <utils/syscache.h>
46+
#include <catalog/pg_type.h>
47+
#include <catalog/catalog.h>
48+
#include <access/printtup.h>
5249

5350
/* ----------------
5451
* backend portal stack for recursive PQexec calls

‎src/backend/libpq/be-fsstubs.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.3 1996/10/31 10:37:49 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.4 1996/11/06 08:48:25 scrappy Exp $
1111
*
1212
* NOTES
1313
* This should be moved to a more appropriate place. It is here
@@ -21,21 +21,23 @@
2121
* closed.
2222
*-------------------------------------------------------------------------
2323
*/
24-
#include "postgres.h"
25-
#include "lib/dllist.h"
26-
#include "libpq/libpq.h"
27-
#include "libpq/libpq-fs.h"
28-
#include "nodes/nodes.h"
29-
#include "utils/memutils.h"
30-
#include "lib/fstack.h"
31-
#include "utils/mcxt.h"
32-
#include "utils/palloc.h"
33-
34-
#include "storage/fd.h" /* for O_ */
35-
#include "storage/large_object.h"
36-
37-
#include "utils/elog.h"
38-
#include "libpq/be-fsstubs.h"
24+
25+
#include <fcntl.h>
26+
#include <sys/types.h>
27+
#include <unistd.h>
28+
29+
#include <postgres.h>
30+
31+
#include <lib/dllist.h>
32+
#include <libpq/libpq.h>
33+
#include <libpq/libpq-fs.h>
34+
#include <nodes/nodes.h>
35+
#include <utils/memutils.h>
36+
#include <lib/fstack.h>
37+
#include <utils/mcxt.h>
38+
#include <storage/fd.h> /* for O_ */
39+
#include <storage/large_object.h>
40+
#include <libpq/be-fsstubs.h>
3941

4042
/*#define FSDB 1*/
4143
#define MAX_LOBJ_FDS 256

‎src/backend/libpq/be-pqexec.c

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.2 1996/11/06 08:48:26 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -20,19 +20,22 @@
2020
* NOTES
2121
* These routines are compiled into the postgres backend.
2222
*/
23-
#include "postgres.h"
23+
#include <postgres.h>
2424

25-
#include "nodes/pg_list.h"
26-
#include "tcop/dest.h"
27-
#include "tcop/fastpath.h"
28-
#include "tcop/tcopprot.h"
29-
#include "lib/dllist.h"
30-
#include "libpq/libpq-be.h"
31-
#include "fmgr.h"
32-
#include "utils/exc.h"
33-
#include "utils/builtins.h"
34-
#include "utils/elog.h"
35-
#include "utils/palloc.h"
25+
#include <nodes/pg_list.h>
26+
#include <tcop/dest.h>
27+
#include <tcop/fastpath.h>
28+
#include <tcop/tcopprot.h>
29+
#include <lib/dllist.h>
30+
#include <libpq/libpq-be.h>
31+
#include <fmgr.h>
32+
#include <utils/exc.h>
33+
#include <utils/builtins.h>
34+
#ifndef HAVE_MEMMOVE
35+
# include <regex/utils.h>
36+
#else
37+
# include <string.h>
38+
#endif
3639

3740
/* ----------------------------------------------------------------
3841
* PQ interface routines

‎src/backend/libpq/hba.c

Lines changed: 7 additions & 7 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.9 1996/11/06 06:48:12 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.10 1996/11/06 08:48:27 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -21,14 +21,14 @@
2121
#include <arpa/inet.h>
2222
#include <unistd.h>
2323
#if defined(sparc_solaris)
24-
#include "inet_aton.h" /* after I copied it into port/sparc_solaris */
24+
#include <inet_aton.h> /* after I copied it into port/sparc_solaris */
2525
#endif
2626

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

3333

3434
#define CONF_FILE "pg_hba.conf"

‎src/backend/libpq/portal.c

Lines changed: 6 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/Attic/portal.c,v 1.3 1996/10/31 10:37:50 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.4 1996/11/06 08:48:28 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -58,11 +58,11 @@
5858
#include <stdio.h> /* for sprintf() */
5959
#include <string.h>
6060

61-
#include "postgres.h"
62-
#include "lib/dllist.h"
63-
#include "libpq/libpq.h" /* where the declarations go */
64-
#include "utils/exc.h"
65-
#include "utils/palloc.h"
61+
#include <postgres.h>
62+
63+
#include <lib/dllist.h>
64+
#include <libpq/libpq.h> /* where the declarations go */
65+
#include <utils/exc.h>
6666

6767

6868
/* ----------------------------------------------------------------

‎src/backend/libpq/portalbuf.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.2 1996/10/31 10:37:51 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.3 1996/11/06 08:48:29 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -47,12 +47,13 @@
4747
* see utils/mmgr/portalmem.c for why. -cim 2/22/91
4848
*
4949
*/
50+
#include <string.h>
5051
#include <sys/types.h>
51-
#include "postgres.h"
5252

53-
#include "libpq/libpq.h" /* where the declarations go */
54-
#include "utils/exc.h"
55-
#include "utils/palloc.h"
53+
#include <postgres.h>
54+
55+
#include <libpq/libpq.h> /* where the declarations go */
56+
#include <utils/exc.h>
5657

5758
PortalEntry** portals = (PortalEntry**) NULL;
5859
size_t portals_array_size = 0;

‎src/backend/libpq/pqcomm.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.4 1996/10/31 10:37:52 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.5 1996/11/06 08:48:30 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -34,33 +34,34 @@
3434
* the postgres backend.
3535
*
3636
*/
37-
38-
#include "postgres.h"
39-
40-
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
4137
#include <stdio.h>
4238
#include <string.h>
39+
#include <errno.h>
40+
#include <fcntl.h>
41+
#include <signal.h>
4342
#ifndef WIN32
4443
#include <unistd.h> /* for ttyname() */
4544
#include <sys/types.h>
4645
#include <sys/socket.h>
4746
#include <netdb.h>
4847
#include <netinet/in.h>
48+
#include <sys/socket.h>
49+
#include <arpa/inet.h>
4950
#else
5051
#include <winsock.h>
5152
#endif /* WIN32 */
52-
#include <errno.h>
53-
#include <fcntl.h>
5453

5554
#if defined(linux)
5655
#ifndef SOMAXCONN
5756
#define SOMAXCONN 5 /* from Linux listen(2) man page */
5857
#endif /* SOMAXCONN */
5958
#endif /* linux */
6059

61-
#include "libpq/auth.h"
62-
#include "libpq/libpq.h" /* where the declarations go */
63-
#include "libpq/pqcomm.h"
60+
#include <postgres.h>
61+
62+
#include <libpq/pqsignal.h> /* substitute for <signal.h> */
63+
#include <libpq/auth.h>
64+
#include <libpq/libpq.h> /* where the declarations go */
6465

6566
/* ----------------
6667
* declarations

‎src/backend/libpq/pqpacket.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.1.1.1 1996/07/09 06:21:31 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.2 1996/11/06 08:48:31 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -48,12 +48,10 @@
4848
#include <fcntl.h>
4949
#include <errno.h>
5050

51-
#include "postgres.h"
52-
#include "miscadmin.h"
53-
#include "utils/elog.h"
54-
#include "storage/ipc.h"
55-
#include "libpq/pqcomm.h" /* where the declarations go */
56-
#include "libpq/libpq.h"
51+
#include <postgres.h>
52+
#include <miscadmin.h>
53+
#include <storage/ipc.h>
54+
#include <libpq/libpq.h>
5755

5856
/*
5957
* PacketReceive -- receive a packet on a port.

‎src/backend/libpq/pqsignal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.2 1996/11/03 06:52:14 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.3 1996/11/06 08:48:32 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"
19+
#include <postgres.h>
2020

21-
#include "libpq/pqsignal.h"
21+
#include <libpq/pqsignal.h>
2222

2323
pqsigfunc
2424
pqsignal(int signo, pqsigfunc func)

0 commit comments

Comments
 (0)