1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00

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
This commit is contained in:
Tom Lane 2022-01-31 15:07:39 -05:00
parent 2d44912cf7
commit 00fdfde6dc

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 < 28 #if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
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 < 28 */ #endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
/* /*
* Decrement the refcount of the given SV within the active Perl interpreter * Decrement the refcount of the given SV within the active Perl interpreter
@ -4135,7 +4135,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 < 28 #if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
static char * static char *
setlocale_perl(int category, char *locale) setlocale_perl(int category, char *locale)
{ {
@ -4203,4 +4203,4 @@ setlocale_perl(int category, char *locale)
return RETVAL; return RETVAL;
} }
#endif /* defined(WIN32) && PERL_VERSION < 28 */ #endif /* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */