Skip to content

Commit 062421d

Browse files
committed
Fix a couple other places that need to know about (some) src/port/ files
explicitly.
1 parent 85bbd54 commit 062421d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/interfaces/ecpg/ecpglib/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.43 2006/09/11 20:10:30 tgl Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.44 2006/09/28 14:48:45 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -27,7 +27,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))
2727

2828
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
2929
connect.o misc.o path.o \
30-
$(filter snprintf.o, $(LIBOBJS))
30+
$(filter snprintf.o strlcpy.o, $(LIBOBJS))
3131

3232
# thread.c is needed only for non-WIN32 implementation of path.c
3333
ifneq ($(PORTNAME), win32)
@@ -51,7 +51,7 @@ include $(top_srcdir)/src/Makefile.shlib
5151
# necessarily use the same object files as the backend uses. Instead,
5252
# symlink the source files in here and build our own object file.
5353

54-
path.c snprintf.c thread.c: % : $(top_srcdir)/src/port/%
54+
path.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/%
5555
rm -f $@ && $(LN_S) $< .
5656

5757
path.o: path.c $(top_builddir)/src/port/pg_config_paths.h
@@ -67,7 +67,7 @@ installdirs:
6767
uninstall: uninstall-lib
6868

6969
clean distclean maintainer-clean: clean-lib
70-
rm -f $(OBJS) path.c snprintf.c thread.c
70+
rm -f $(OBJS) path.c snprintf.c strlcpy.c thread.c
7171

7272
depend dep:
7373
$(CC) -MM $(CFLAGS) *.c >depend

src/tools/msvc/mkvcbuild.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
our @pgportfiles = qw(
1818
crypt.c fseeko.c getrusage.c inet_aton.c random.c srandom.c
1919
unsetenv.c getaddrinfo.c gettimeofday.c kill.c open.c rand.c
20-
snprintf.c copydir.c dirmod.c exec.c noblock.c path.c pipe.c
20+
snprintf.c strlcpy.c copydir.c dirmod.c exec.c noblock.c path.c pipe.c
2121
pgsleep.c pgstrcasecmp.c sprompt.c thread.c getopt.c getopt_long.c
2222
dirent.c rint.c win32error.c);
2323

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy