mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plperl: Fix breakage of c89f409749c in back branches.

Browse Source 
ppport.h was only updated in 05798c9f7f0 (master). Unfortunately my commit
c89f409749c uses PERL_VERSION_LT which came in with that update. Breaking most
buildfarm animals.

I should have noticed that...

We might want to backpatch the ppport update instead, but for now lets get the
buildfarm green again.

Discussion: https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de
Backpatch: 10-14, master doesn't need it
This commit is contained in:
Andres Freund 2022-01-30 17:53:53 -08:00
parent 0dc0fe7b6c
commit 4afb5aeb9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pl/plperl/plperl.c
View File

@ -298,11 +298,11 @@ static char *strip_trailing_ws(const char *msg);
static OP *pp_require_safe(pTHX); static OP *pp_require_safe(pTHX);
static void activate_interpreter(plperl_interp_desc *interp_desc); static void activate_interpreter(plperl_interp_desc *interp_desc);
#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0) #if defined(WIN32) && PERL_VERSION < 28
static char *setlocale_perl(int category, char *locale); static char *setlocale_perl(int category, char *locale);
#else #else
#define setlocale_perl(a,b) Perl_setlocale(a,b) #define setlocale_perl(a,b) Perl_setlocale(a,b)
#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */ #endif /* defined(WIN32) && PERL_VERSION < 28 */
/* /*
* Decrement the refcount of the given SV within the active Perl interpreter * Decrement the refcount of the given SV within the active Perl interpreter
@ -4140,7 +4140,7 @@ plperl_inline_callback(void *arg)
* *
* Starting in 5.28, perl exposes Perl_setlocale to do so. * Starting in 5.28, perl exposes Perl_setlocale to do so.
*/ */
#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0) #if defined(WIN32) && PERL_VERSION < 28
static char * static char *
setlocale_perl(int category, char *locale) setlocale_perl(int category, char *locale)
{ {
@ -4208,4 +4208,4 @@ setlocale_perl(int category, char *locale)
return RETVAL; return RETVAL;
} }
#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */ #endif /* defined(WIN32) && PERL_VERSION < 28 */