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

Commit c312583

Browse files
committed
Add sys/time.h to fe-misc.c, prevent pgtclsh from using old libaries,
and allow CUSTOM_COPT to appear in compile AND LINK commands.
1 parent 02a9d7e commit c312583

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/Makefile.global.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.41 1998/04/27 17:07:22 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.42 1998/05/12 15:42:08 momjian Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -257,6 +257,7 @@ endif
257257

258258
ifdef COPT
259259
CFLAGS+= $(COPT)
260+
LDFLAGS+= $(COPT)
260261
endif
261262

262263
ifdef PROFILE

src/bin/pgtclsh/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.18 1998/05/12 15:42:08 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -22,8 +22,8 @@ CFLAGS+= $(KRBFLAGS)
2222
endif
2323

2424
# try to find libpgtcl.a in either directory
25-
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl
26-
LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq
25+
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
26+
LIBPQ= -L$(LIBPQDIR) -lpq
2727

2828
all: pgtclsh pgtksh
2929

src/interfaces/libpq/fe-misc.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
*
2626
* IDENTIFICATION
27-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.13 1998/05/07 16:17:16 momjian Exp $
27+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.14 1998/05/12 15:42:09 momjian Exp $
2828
*
2929
*-------------------------------------------------------------------------
3030
*/
@@ -34,6 +34,7 @@
3434
#include <string.h>
3535
#include <errno.h>
3636
#include <time.h>
37+
#include <sys/time.h>
3738
#if !defined(NO_UNISTD_H)
3839
#include <unistd.h>
3940
#endif

0 commit comments

Comments
 (0)