diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-01-31 15:07:39 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-01-31 15:07:39 -0500 |
| commit | f83d427d323b77b6fd2a3e794157a3b54cf23b0a (patch) | |
| tree | 0c72af6bc0bae17318906eb218b30b6fc175d661 | |
| parent | 8be956c65c06b90a058f8bac0010152126923f43 (diff) | |
| download | postgresql-f83d427d323b77b6fd2a3e794157a3b54cf23b0a.tar.gz postgresql-f83d427d323b77b6fd2a3e794157a3b54cf23b0a.zip | |
Revert "plperl: Fix breakage of c89f409749c in back branches."
This reverts commits d81cac47a et al. We shouldn't need that
hack after the preceding commits.
Discussion: https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de
| -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 c87715f34be..bfd4ff2baf8 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 < 28 +#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0) static char *setlocale_perl(int category, char *locale); #else #define setlocale_perl(a,b) Perl_setlocale(a,b) -#endif /* defined(WIN32) && PERL_VERSION < 28 */ +#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */ /* * 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 < 28 +#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0) 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 < 28 */ +#endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */ |