postgres.git / summary / log / commit / refs

commit    d81cac47a829c3e2c729ef98acaf132adb7ff3ae
Author:   Andres Freund <andres@anarazel.de>
Date:     Mon Jan 31 01:53:53 2022 +0000

    plperl: Fix breakage of c89f409749c in back branches.
    
    ppport.h was only updated in 05798c9f7f0 (master). Unfortunately my commit
    c89f409749c uses PERL_VERSION_LT which came in with that update. Breaking most
    buildfarm animals.
    
    I should have noticed that...
    
    We might want to backpatch the ppport update instead, but for now lets get the
    buildfarm green again.
    
    Discussion: https://postgr.es/m/20220131015130.shn6wr2fzuymerf6@alap3.anarazel.de
    Backpatch: 10-14, master doesn't need it


 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 8824beb08ed..d1de68eb6bc 100644
--- 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_LT(5, 28, 0)
+#if defined(WIN32) && PERL_VERSION < 28
 static char *setlocale_perl(int category, char *locale);
 #else
 #define setlocale_perl(a,b)  Perl_setlocale(a,b)
-#endif							/* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
+#endif							/* defined(WIN32) && PERL_VERSION < 28 */
 
 /*
  * 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.
  */
-#if defined(WIN32) && PERL_VERSION_LT(5, 28, 0)
+#if defined(WIN32) && PERL_VERSION < 28
 static char *
 setlocale_perl(int category, char *locale)
 {
@@ -4203,4 +4203,4 @@ setlocale_perl(int category, char *locale)
 
 	return RETVAL;
 }
-#endif							/* defined(WIN32) && PERL_VERSION_LT(5, 28, 0) */
+#endif							/* defined(WIN32) && PERL_VERSION < 28 */


[parent: 8484e38126d7]