Skip to content

Commit 4bdf308

Browse files
committed
shared build fails, but the rest compiles...formatting error in the
cc -shared, I believe...
1 parent aed384f commit 4bdf308

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

src/interfaces/libpq/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.9 1996/11/02 09:54:44 bryanh Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.10 1996/11/03 07:14:29 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include ../Makefile.global
1616

17-
INCLUDE_OPT= \
18-
-I. \
19-
-I../include \
20-
-I../backend \
17+
INCLUDE_OPT= -I../include -I.
2118

2219
CFLAGS+= $(INCLUDE_OPT) -DPOSTPORT='"$(POSTPORT)"'
2320

src/interfaces/libpq/fe-auth.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.5 1996/10/13 04:50:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.6 1996/11/03 07:14:30 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -33,6 +33,9 @@
3333
#include <unistd.h>
3434
#include <sys/types.h>
3535
#include <pwd.h>
36+
37+
#include "postgres.h"
38+
3639
#include "libpq/pqcomm.h"
3740

3841
#include "libpq-fe.h"

src/interfaces/libpq/fe-connect.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.12 1996/10/29 21:53:48 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.13 1996/11/03 07:14:31 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -22,8 +22,10 @@
2222
#include <netdb.h>
2323
#include <errno.h>
2424
#include <signal.h>
25-
#include <libpq/pqcomm.h> /* for decls of MsgType, PacketBuf, StartupInfo */
26-
#include <fe-auth.h>
25+
26+
#include "postgres.h"
27+
#include "libpq/pqcomm.h" /* for decls of MsgType, PacketBuf, StartupInfo */
28+
#include "fe-auth.h"
2729
#include "libpq-fe.h"
2830

2931
#if defined(PORTNAME_ultrix4) || defined(PORTNAME_next)
@@ -141,7 +143,7 @@ PQsetdb(const char *pghost, const char* pgport, const char* pgoptions, const cha
141143
} else
142144
conn->pgoptions = strdup(pgoptions);
143145

144-
if (tmp = getenv("PGUSER")) {
146+
if ((tmp = getenv("PGUSER"))) {
145147
error = FALSE;
146148
conn->pguser = strdup(tmp);
147149
} else {

src/interfaces/libpq/fe-misc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.2 1996/08/06 16:16:48 scrappy Exp $
14+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.3 1996/11/03 07:14:32 scrappy Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
1818

1919
#include <stdlib.h>
2020
#include <stdio.h>
21+
22+
#include "postgres.h"
23+
2124
#include "libpq-fe.h"
2225

2326
/* pqGetc:

0 commit comments

Comments
 (0)