Skip to content

Commit 923f9f4

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 ac37448 commit 923f9f4

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
@@ -2121,8 +2121,8 @@ plperl_create_sub(plperl_proc_desc *prodesc, const char *s, Oid fn_oid)
21212121
* errors properly. Perhaps it's because there's another level of eval
21222122
* inside mksafefunc?
21232123
*/
2124-
count = perl_call_pv("PostgreSQL::InServer::mkfunc",
2125-
G_SCALAR | G_EVAL | G_KEEPERR);
2124+
count = call_pv("PostgreSQL::InServer::mkfunc",
2125+
G_SCALAR | G_EVAL | G_KEEPERR);
21262126
SPAGAIN;
21272127

21282128
if (count == 1)
@@ -2229,7 +2229,7 @@ plperl_call_perl_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo)
22292229
PUTBACK;
22302230

22312231
/* Do NOT use G_KEEPERR here */
2232-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2232+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
22332233

22342234
SPAGAIN;
22352235

@@ -2297,7 +2297,7 @@ plperl_call_perl_trigger_func(plperl_proc_desc *desc, FunctionCallInfo fcinfo,
22972297
PUTBACK;
22982298

22992299
/* Do NOT use G_KEEPERR here */
2300-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2300+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
23012301

23022302
SPAGAIN;
23032303

@@ -2360,7 +2360,7 @@ plperl_call_perl_event_trigger_func(plperl_proc_desc *desc,
23602360
PUTBACK;
23612361

23622362
/* Do NOT use G_KEEPERR here */
2363-
count = perl_call_sv(desc->reference, G_SCALAR | G_EVAL);
2363+
count = call_sv(desc->reference, G_SCALAR | G_EVAL);
23642364

23652365
SPAGAIN;
23662366

‎src/pl/plperl/plperl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@
116116
#endif /* USE_REPL_SNPRINTF */
117117

118118
/* perl version and platform portability */
119-
#define NEED_eval_pv
120-
#define NEED_newRV_noinc
121-
#define NEED_sv_2pv_flags
122119
#include "ppport.h"
123120

124121
/*

0 commit comments

Comments
 (0)