Skip to content

Commit 2d44912

Browse files
tglsfdctglsfdc
committed
plperl: update ppport.h to Perl 5.34.0.
Also apply the changes suggested by running perl ppport.h --compat-version=5.8.0 And remove some no-longer-required NEED_foo declarations. Dagfinn Ilmari Mannsåker Back-patch of commit 05798c9 into all supported branches. At the time we thought this update was mostly cosmetic, but the lack of it has caused trouble, while the patch itself hasn't. Discussion: https://postgr.es/m/87y278s6iq.fsf@wibble.ilmari.org Discussion: https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de
1 parent d81cac4 commit 2d44912

File tree

3 files changed

+14726
-3875
lines changed

3 files changed

+14726
-3875
lines changed

‎src/pl/plperl/plperl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,8 +2111,8 @@ plperl_create_sub(plperl_proc_desc *prodesc, const char *s, Oid fn_oid)
21112111
* errors properly. Perhaps it's because there's another level of eval
21122112
* inside mksafefunc?
21132113
*/
2114-
count = perl_call_pv("PostgreSQL::InServer::mkfunc",
2115-
G_SCALAR | G_EVAL | G_KEEPERR);
2114+
count = call_pv("PostgreSQL::InServer::mkfunc",
2115+
G_SCALAR | G_EVAL | G_KEEPERR);
21162116
SPAGAIN;
21172117

21182118
if (count == 1)
@@ -2217,7 +2217,7 @@ plperl_call_perl_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo)
22172217
PUTBACK;
22182218

22192219
/* Do NOT use G_KEEPERR here */
2220-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2220+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
22212221

22222222
SPAGAIN;
22232223

@@ -2285,7 +2285,7 @@ plperl_call_perl_trigger_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo,
22852285
PUTBACK;
22862286

22872287
/* Do NOT use G_KEEPERR here */
2288-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2288+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
22892289

22902290
SPAGAIN;
22912291

@@ -2348,7 +2348,7 @@ plperl_call_perl_event_trigger_func(plperl_proc_desc *desc,
23482348
PUTBACK;
23492349

23502350
/* Do NOT use G_KEEPERR here */
2351-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2351+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
23522352

23532353
SPAGAIN;
23542354

‎src/pl/plperl/plperl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
#endif
165165

166166
/* perl version and platform portability */
167-
#define NEED_eval_pv
168-
#define NEED_newRV_noinc
169-
#define NEED_sv_2pv_flags
170167
#include "ppport.h"
171168

172169
/*

0 commit comments

Comments
 (0)