Skip to content

Commit 0a7ded1

Browse files
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 bb82e8a commit 0a7ded1

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
@@ -2132,8 +2132,8 @@ plperl_create_sub(plperl_proc_desc *prodesc, const char *s, Oid fn_oid)
21322132
* errors properly. Perhaps it's because there's another level of eval
21332133
* inside mksafefunc?
21342134
*/
2135-
count = perl_call_pv("PostgreSQL::InServer::mkfunc",
2136-
G_SCALAR | G_EVAL | G_KEEPERR);
2135+
count = call_pv("PostgreSQL::InServer::mkfunc",
2136+
G_SCALAR | G_EVAL | G_KEEPERR);
21372137
SPAGAIN;
21382138

21392139
if (count == 1)
@@ -2240,7 +2240,7 @@ plperl_call_perl_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo)
22402240
PUTBACK;
22412241

22422242
/* Do NOT use G_KEEPERR here */
2243-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2243+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
22442244

22452245
SPAGAIN;
22462246

@@ -2308,7 +2308,7 @@ plperl_call_perl_trigger_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo,
23082308
PUTBACK;
23092309

23102310
/* Do NOT use G_KEEPERR here */
2311-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2311+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
23122312

23132313
SPAGAIN;
23142314

@@ -2371,7 +2371,7 @@ plperl_call_perl_event_trigger_func(plperl_proc_desc *desc,
23712371
PUTBACK;
23722372

23732373
/* Do NOT use G_KEEPERR here */
2374-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2374+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
23752375

23762376
SPAGAIN;
23772377

src/pl/plperl/plperl.h

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

165165
/* perl version and platform portability */
166-
#define NEED_eval_pv
167-
#define NEED_newRV_noinc
168-
#define NEED_sv_2pv_flags
169166
#include "ppport.h"
170167

171168
/*

0 commit comments

Comments
 (0)