Skip to content

Commit d81cac4

Browse files
committed
plperl: Fix breakage of c89f409 in back branches.
ppport.h was only updated in 05798c9 (master). Unfortunately my commit c89f409 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
1 parent 8484e38 commit d81cac4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/pl/plperl/plperl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,11 @@ static char *strip_trailing_ws(const char *msg);
298298
static OP *pp_require_safe(pTHX);
299299
static void activate_interpreter(plperl_interp_desc *interp_desc);
300300

301-
#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
301+
#if defined(WIN32) && PERL_VERSION < 28
302302
static char *setlocale_perl(int category, char *locale);
303303
#else
304304
#define setlocale_perl(a,b) Perl_setlocale(a,b)
305-
#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
305+
#endif /* defined(WIN32) && PERL_VERSION < 28 */
306306

307307
/*
308308
* Decrement the refcount of the given SV within the active Perl interpreter
@@ -4135,7 +4135,7 @@ plperl_inline_callback(void *arg)
41354135
*
41364136
* Starting in 5.28, perl exposes Perl_setlocale to do so.
41374137
*/
4138-
#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
4138+
#if defined(WIN32) && PERL_VERSION < 28
41394139
static char *
41404140
setlocale_perl(int category, char *locale)
41414141
{
@@ -4203,4 +4203,4 @@ setlocale_perl(int category, char *locale)
42034203

42044204
return RETVAL;
42054205
}
4206-
#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
4206+
#endif /* defined(WIN32) && PERL_VERSION < 28 */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy