summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2022-01-31 01:53:53 +0000
committerAndres Freund2022-01-31 02:00:57 +0000
commit4afb5aeb9f1285bd3ff2b370671c7ad5a91445c9 (patch)
treed70545c2513a5454f73449a0b4cd6f6869ccb6fe
parent0dc0fe7b6c4583955f643c3ba7ea625767f300bb (diff)
plperl: Fix breakage of c89f409749c in back branches.
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
-rw-r--r--src/pl/plperl/plperl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index b48d66f04bc..fe60baa8914 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -298,11 +298,11 @@ static char *strip_trailing_ws(const char *msg);
static OP *pp_require_safe(pTHX);
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);
#else
#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
@@ -4140,7 +4140,7 @@ plperl_inline_callback(void *arg)
*
* 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 *
setlocale_perl(int category, char *locale)
{
@@ -4208,4 +4208,4 @@ setlocale_perl(int category, char *locale)
return RETVAL;
}
-#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
+#endif /* defined(WIN32) && PERL_VERSION < 28 */