Revert "plperl: Fix breakage of c89f409 in back branches."

tglsfdc · tglsfdc · commit ff86ee3d2175 · 2022-01-31T15:07:39.000-05:00
This reverts commits d81cac4 et al. We shouldn't need that hack after the preceding commits. Discussion: https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de
diff --git 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 < 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
@@ -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 < 28
+#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
 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 < 28 */
+#endif							/* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
