Commitff86ee3

committed

Revert "plperl: Fix breakage ofc89f409 in back branches."

This reverts commitsd81cac4 et al. We shouldn't need thathack after the preceding commits.Discussion:https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de

1 parentbc89af2 commitff86ee3Copy full SHA for ff86ee3

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,11 +298,11 @@ static char strip_trailing_ws(const char msg);`
`298`	`298`	`staticOP*pp_require_safe(pTHX);`
`299`	`299`	`staticvoidactivate_interpreter(plperl_interp_desc*interp_desc);`
`300`	`300`
`301`		`-#if defined(WIN32)&&PERL_VERSION<28`
	`301`	`+#if defined(WIN32)&&PERL_VERSION_LT(5,28,0)`
`302`	`302`	`staticcharsetlocale_perl(intcategory,charlocale);`
`303`	`303`	`#else`
`304`	`304`	`#definesetlocale_perl(a,b) Perl_setlocale(a,b)`
`305`		`-#endif/* defined(WIN32) &&PERL_VERSION < 28 */`
	`305`	`+#endif/* defined(WIN32) &&PERL_VERSION_LT(5, 28, 0) */`
`306`	`306`
`307`	`307`	`/*`
`308`	`308`	`* Decrement the refcount of the given SV within the active Perl interpreter`
`@@ -4140,7 +4140,7 @@ plperl_inline_callback(void *arg)`
`4140`	`4140`	`*`
`4141`	`4141`	`* Starting in 5.28, perl exposes Perl_setlocale to do so.`
`4142`	`4142`	`*/`
`4143`		`-#if defined(WIN32)&&PERL_VERSION<28`
	`4143`	`+#if defined(WIN32)&&PERL_VERSION_LT(5,28,0)`
`4144`	`4144`	`staticchar*`
`4145`	`4145`	`setlocale_perl(intcategory,char*locale)`
`4146`	`4146`	`{`
`@@ -4208,4 +4208,4 @@ setlocale_perl(int category, char *locale)`
`4208`	`4208`
`4209`	`4209`	`returnRETVAL;`
`4210`	`4210`	`}`
`4211`		`-#endif/* defined(WIN32) &&PERL_VERSION < 28 */`
	`4211`	`+#endif/* defined(WIN32) &&PERL_VERSION_LT(5, 28, 0) */`

Comments

(0)