diff options
| author | Andres Freund <andres@anarazel.de> | 2022-01-30 17:53:53 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-01-30 18:01:21 -0800 |
| commit | 503c65644dd9d6502371c418163ca4316a8bd3f1 (patch) | |
| tree | 1a066cf4cc3a50a29dce5ebe93a0ba6b4d2b9c19 | |
| parent | 2557a03f890686501029f9ec12856a4abbc5f414 (diff) | |
| download | postgresql-503c65644dd9d6502371c418163ca4316a8bd3f1.tar.gz postgresql-503c65644dd9d6502371c418163ca4316a8bd3f1.zip | |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 6e557fb3363..de61c06a9d0 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -300,11 +300,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 @@ -4039,7 +4039,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) { @@ -4107,4 +4107,4 @@ setlocale_perl(int category, char *locale) return RETVAL; } -#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */ +#endif /* defined(WIN32) && PERL_VERSION < 28 */ |