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

Commitb1fae82

Browse files
committed
Re-include pqsignal() in libpq.
We need this in non-ENABLE_THREAD_SAFETY builds, and also to satisfythe exports.txt entry; while it might be a good idea to remove thelatter, I'm hesitant to do so except in the context of an intentionalABI break. At least we don't have a separately maintained source filefor it anymore.
1 parente2a203a commitb1fae82

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

‎src/interfaces/libpq/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/noblock.c
99
/open.c
1010
/pgstrcasecmp.c
11+
/pqsignal.c
1112
/snprintf.c
1213
/strerror.c
1314
/strlcpy.c

‎src/interfaces/libpq/Makefile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ 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 fe-secure.o\
3636
libpq-events.o
3737
# libpgport C files we always use
38-
OBJS += chklocale.o inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o
38+
OBJS += chklocale.o inet_net_ntop.o noblock.o pgstrcasecmp.o pqsignal.o\
39+
thread.o
3940
# libpgport C files that are needed if identified by configure
4041
OBJS +=$(filter crypt.o getaddrinfo.o getpeereid.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o win32setlocale.o,$(LIBOBJS))
4142
# backend/libpq
@@ -81,14 +82,14 @@ include $(top_srcdir)/src/Makefile.shlib
8182
backend_src =$(top_srcdir)/src/backend
8283

8384

84-
# We use several backend modules verbatim, but since we need to
85-
# compile with appropriate options to build a shared lib, we can't
86-
# necessarily use the same object filesasthe backend uses. Instead,
87-
# symlink the source files in here and build our own objectfile.
85+
# We use severallibpgport andbackend modules verbatim, but since we need
86+
#tocompile with appropriate options to build a shared lib, we can't
87+
# necessarily use the same object filesbuilt for libpgport andthe backend.
88+
#Instead,symlink the source files in here and build our own objectfiles.
8889
# For some libpgport modules, this only happens if configure decides
8990
# the module is needed (see filter hack in OBJS, above).
9091

91-
chklocale.ccrypt.cgetaddrinfo.cgetpeereid.cinet_aton.cinet_net_ntop.cnoblock.copen.cpgsleep.cpgstrcasecmp.csnprintf.cstrerror.cstrlcpy.cthread.cwin32error.cwin32setlocale.c:% :$(top_srcdir)/src/port/%
92+
chklocale.ccrypt.cgetaddrinfo.cgetpeereid.cinet_aton.cinet_net_ntop.cnoblock.copen.cpgsleep.cpgstrcasecmp.cpqsignal.csnprintf.cstrerror.cstrlcpy.cthread.cwin32error.cwin32setlocale.c:% :$(top_srcdir)/src/port/%
9293
rm -f$@&&$(LN_S)$<.
9394

9495
ip.cmd5.c:% :$(backend_src)/libpq/%
@@ -139,7 +140,7 @@ clean distclean: clean-lib
139140
rm -f$(OBJS) pthread.h libpq.rc
140141
# Might be left over from a Win32 client-only build
141142
rm -f pg_config_paths.h
142-
rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c
143+
rm -f inet_net_ntop.c noblock.c pgstrcasecmp.cpqsignal.cthread.c
143144
rm -f chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c win32setlocale.c
144145
rm -f pgsleep.c
145146
rm -f md5.c ip.c

‎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)\pqsignal.obj"
7980
-@erase"$(INTDIR)\thread.obj"
8081
-@erase"$(INTDIR)\inet_aton.obj"
8182
-@erase"$(INTDIR)\crypt.obj"
@@ -120,6 +121,7 @@ LIB32_OBJS= \
120121
"$(INTDIR)\win32.obj"\
121122
"$(INTDIR)\getaddrinfo.obj"\
122123
"$(INTDIR)\pgstrcasecmp.obj"\
124+
"$(INTDIR)\pqsignal.obj"\
123125
"$(INTDIR)\thread.obj"\
124126
"$(INTDIR)\inet_aton.obj"\
125127
"$(INTDIR)\crypt.obj"\
@@ -207,6 +209,11 @@ LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
207209
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
208210
<<
209211

212+
"$(INTDIR)\pqsignal.obj" : ..\..\port\pqsignal.c
213+
$(CPP) @<<
214+
$(CPP_PROJ) ..\..\port\pqsignal.c
215+
<<
216+
210217
"$(INTDIR)\thread.obj" : ..\..\port\thread.c
211218
$(CPP) @<<
212219
$(CPP_PROJ) ..\..\port\thread.c

‎src/interfaces/libpq/win32.mak

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
8383
CLEAN :
8484
-@erase"$(INTDIR)\getaddrinfo.obj"
8585
-@erase"$(INTDIR)\pgstrcasecmp.obj"
86+
-@erase"$(INTDIR)\pqsignal.obj"
8687
-@erase"$(INTDIR)\thread.obj"
8788
-@erase"$(INTDIR)\inet_aton.obj"
8889
-@erase"$(INTDIR)\crypt.obj"
@@ -130,6 +131,7 @@ LIB32_OBJS= \
130131
"$(INTDIR)\win32.obj"\
131132
"$(INTDIR)\getaddrinfo.obj"\
132133
"$(INTDIR)\pgstrcasecmp.obj"\
134+
"$(INTDIR)\pqsignal.obj"\
133135
"$(INTDIR)\thread.obj"\
134136
"$(INTDIR)\inet_aton.obj"\
135137
"$(INTDIR)\crypt.obj"\
@@ -247,6 +249,11 @@ LINK32_OBJS= \
247249
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
248250
<<
249251

252+
"$(INTDIR)\pqsignal.obj" : ..\..\port\pqsignal.c
253+
$(CPP) @<<
254+
$(CPP_PROJ) ..\..\port\pqsignal.c
255+
<<
256+
250257
"$(INTDIR)\thread.obj" : ..\..\port\thread.c
251258
$(CPP) @<<
252259
$(CPP_PROJ) ..\..\port\thread.c

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp