Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit85bbd54

Browse files
committed
Oops, forgot that libpq needs extra steps to make use of src/port/ files.
1 parentc92f7e2 commit85bbd54

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

‎src/interfaces/libpq/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.148 2006/09/09 03:15:40 tgl Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.149 2006/09/27 21:29:17 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -34,7 +34,7 @@ LIBS := $(LIBS:-lpgport=)
3434
OBJS=fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
3535
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o\
3636
md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o\
37-
$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o,$(LIBOBJS))
37+
$(filter crypt.o getaddrinfo.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o,$(LIBOBJS))
3838

3939
ifeq ($(PORTNAME), cygwin)
4040
overrideshlib = cyg$(NAME)$(DLSUFFIX)
@@ -80,7 +80,7 @@ backend_src = $(top_srcdir)/src/backend
8080
# For port modules, this only happens if configure decides the module
8181
# is needed (see filter hack in OBJS, above).
8282

83-
crypt.cgetaddrinfo.cinet_aton.cnoblock.cpgstrcasecmp.csnprintf.cstrerror.copen.cthread.c:% :$(top_srcdir)/src/port/%
83+
crypt.cgetaddrinfo.cinet_aton.cnoblock.copen.cpgstrcasecmp.csnprintf.cstrerror.cstrlcpy.cthread.c:% :$(top_srcdir)/src/port/%
8484
rm -f$@&&$(LN_S)$<.
8585

8686
md5.cip.c:% :$(backend_src)/libpq/%
@@ -169,7 +169,7 @@ uninstall: uninstall-lib
169169
rm -f'$(DESTDIR)$(includedir)/libpq-fe.h''$(DESTDIR)$(includedir_internal)/libpq-int.h''$(DESTDIR)$(includedir_internal)/pqexpbuffer.h''$(DESTDIR)$(datadir)/pg_service.conf.sample'
170170

171171
cleandistclean: clean-lib
172-
rm -f$(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.copen.c thread.c md5.c ip.c encnames.c wchar.c pthread.h exports.list
172+
rm -f$(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.copen.cpgstrcasecmp.c snprintf.c strerror.cstrlcpy.c thread.c md5.c ip.c encnames.c wchar.c pthread.h exports.list
173173
rm -f pg_config_paths.h# Might be left over from a Win32 client-only build
174174

175175
maintainer-clean: distclean

‎src/interfaces/libpq/bcc32.mak

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
7676
CLEAN :
7777
-@erase"$(INTDIR)\getaddrinfo.obj"
7878
-@erase"$(INTDIR)\pgstrcasecmp.obj"
79+
-@erase"$(INTDIR)\strlcpy.obj"
7980
-@erase"$(INTDIR)\thread.obj"
8081
-@erase"$(INTDIR)\inet_aton.obj"
8182
-@erase"$(INTDIR)\crypt.obj"
@@ -112,6 +113,7 @@ LIB32_OBJS= \
112113
"$(INTDIR)\win32.obj"\
113114
"$(INTDIR)\getaddrinfo.obj"\
114115
"$(INTDIR)\pgstrcasecmp.obj"\
116+
"$(INTDIR)\strlcpy.obj"\
115117
"$(INTDIR)\thread.obj"\
116118
"$(INTDIR)\inet_aton.obj"\
117119
"$(INTDIR)\crypt.obj"\
@@ -185,6 +187,11 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
185187
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
186188
<<
187189

190+
"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c
191+
$(CPP) @<<
192+
$(CPP_PROJ) ..\..\port\strlcpy.c
193+
<<
194+
188195
"$(INTDIR)\thread.obj" : ..\..\port\thread.c
189196
$(CPP) @<<
190197
$(CPP_PROJ) ..\..\port\thread.c

‎src/interfaces/libpq/win32.mak

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CLEAN :
6969
-@erase"$(INTDIR)\encnames.obj"
7070
-@erase"$(INTDIR)\pthread-win32.obj"
7171
-@erase"$(INTDIR)\snprintf.obj"
72+
-@erase"$(INTDIR)\strlcpy.obj"
7273
-@erase"$(OUTDIR)\$(OUTFILENAME).lib"
7374
-@erase"$(OUTDIR)\$(OUTFILENAME)dll.lib"
7475
-@erase"$(OUTDIR)\libpq.res"
@@ -105,6 +106,7 @@ LIB32_OBJS= \
105106
"$(INTDIR)\wchar.obj"\
106107
"$(INTDIR)\encnames.obj"\
107108
"$(INTDIR)\snprintf.obj"\
109+
"$(INTDIR)\strlcpy.obj"\
108110
"$(INTDIR)\pthread-win32.obj"
109111

110112

@@ -220,6 +222,11 @@ LINK32_OBJS= \
220222
$(CPP_PROJ) /I"." ..\..\port\snprintf.c
221223
<<
222224

225+
"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c
226+
$(CPP) @<<
227+
$(CPP_PROJ) /I"." ..\..\port\strlcpy.c
228+
<<
229+
223230
.c{$(CPP_OBJS)}.obj:
224231
$(CPP)$(CPP_PROJ)$<
225232

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp