From 062421defb838c7a7a441071888ac8af268322e3 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 28 Sep 2006 14:48:45 +0000
Subject: [PATCH] Fix a couple other places that need to know about (some)
src/port/ files explicitly.
---
src/interfaces/ecpg/ecpglib/Makefile | 8 ++++----
src/tools/msvc/mkvcbuild.pl | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index c8d1c437f5b..aac082813b6 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.43 2006/09/11 20:10:30 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.44 2006/09/28 14:48:45 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -27,7 +27,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
connect.o misc.o path.o \
- $(filter snprintf.o, $(LIBOBJS))
+ $(filter snprintf.o strlcpy.o, $(LIBOBJS))
# thread.c is needed only for non-WIN32 implementation of path.c
ifneq ($(PORTNAME), win32)
@@ -51,7 +51,7 @@ include $(top_srcdir)/src/Makefile.shlib
# necessarily use the same object files as the backend uses. Instead,
# symlink the source files in here and build our own object file.
-path.c snprintf.c thread.c: % : $(top_srcdir)/src/port/%
+path.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
path.o: path.c $(top_builddir)/src/port/pg_config_paths.h
@@ -67,7 +67,7 @@ installdirs:
uninstall: uninstall-lib
clean distclean maintainer-clean: clean-lib
- rm -f $(OBJS) path.c snprintf.c thread.c
+ rm -f $(OBJS) path.c snprintf.c strlcpy.c thread.c
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index 4020aa0d4c0..69a79afdee4 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -17,7 +17,7 @@ my $solution = new Solution($config);
our @pgportfiles = qw(
crypt.c fseeko.c getrusage.c inet_aton.c random.c srandom.c
unsetenv.c getaddrinfo.c gettimeofday.c kill.c open.c rand.c
- snprintf.c copydir.c dirmod.c exec.c noblock.c path.c pipe.c
+ snprintf.c strlcpy.c copydir.c dirmod.c exec.c noblock.c path.c pipe.c
pgsleep.c pgstrcasecmp.c sprompt.c thread.c getopt.c getopt_long.c
dirent.c rint.c win32error.c);
--
GitLab