Commit c3125837 authored by Bruce Momjian's avatar Bruce Momjian

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.
parent 02a9d7e2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.41 1998/04/27 17:07:22 scrappy Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.42 1998/05/12 15:42:08 momjian Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -257,6 +257,7 @@ endif ...@@ -257,6 +257,7 @@ endif
ifdef COPT ifdef COPT
CFLAGS+= $(COPT) CFLAGS+= $(COPT)
LDFLAGS+= $(COPT)
endif endif
ifdef PROFILE ifdef PROFILE
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.18 1998/05/12 15:42:08 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -22,8 +22,8 @@ CFLAGS+= $(KRBFLAGS) ...@@ -22,8 +22,8 @@ CFLAGS+= $(KRBFLAGS)
endif endif
# try to find libpgtcl.a in either directory # try to find libpgtcl.a in either directory
LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -L$(LIBDIR) -lpgtcl LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
LIBPQ= -L$(LIBPQDIR) -L$(LIBDIR) -lpq LIBPQ= -L$(LIBPQDIR) -lpq
all: pgtclsh pgtksh all: pgtclsh pgtksh
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.13 1998/05/07 16:17:16 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.14 1998/05/12 15:42:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <sys/time.h>
#if !defined(NO_UNISTD_H) #if !defined(NO_UNISTD_H)
#include <unistd.h> #include <unistd.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment