postgres.git / summary / log / commit / refs

commit    e3689105437c2a0451d1dbefcd0dc45f60bda618
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Jan 31 20:07:39 2022 +0000
First released in: 10.20, 11.15, 12.10, 13.6, 14.2

    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


 src/pl/plperl/plperl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index a9f2229fdb7..a4cd83d6c99 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -302,11 +302,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
@@ -4143,7 +4143,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)
 {
@@ -4211,4 +4211,4 @@ setlocale_perl(int category, char *locale)
 
 	return RETVAL;
 }
-#endif							/* defined(WIN32) && PERL_VERSION < 28 */
+#endif							/* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */


[parent: 923f9f416179]