From c029b5fd56b9a1b74c3f31d7246739acf3bf6d81 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Tue, 25 Jul 2023 21:01:09 +0100
Subject: [PATCH] Perl 5.38 compatibility

perl.h in Perl 5.38 STRLEN usage conflicts with the one in macros.h so
we need to include perl.h first
---
 innd/cc.c    | 11 +++++++----
 innd/perl.c  |  8 ++++++--
 nnrpd/perl.c |  8 ++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/innd/cc.c b/innd/cc.c
index 7a2fd39..0a3ab61 100644
--- a/innd/cc.c
+++ b/innd/cc.c
@@ -12,6 +12,13 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "configdata.h"
+
+#if defined(DO_PERL)
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+#endif
+
 #include "clibrary.h"
 #include "innd.h"
 #include "inndcomm.h"
@@ -634,10 +641,6 @@ CCfilter(av)
 
 #if defined(DO_PERL)
 
-#include <EXTERN.h>
-#include <perl.h>
-#include <XSUB.h>
-
 extern CV *perl_filter_cv ;
 
 STATIC STRING
diff --git a/innd/perl.c b/innd/perl.c
index f2b96ce..3ade89a 100644
--- a/innd/perl.c
+++ b/innd/perl.c
@@ -19,14 +19,18 @@ static void use_rcsid (const char *rid) {   /* Never called */
 #include <stdio.h>
 #include <sys/types.h>
 #include "configdata.h"
+
+#if defined(DO_PERL)
+#include <EXTERN.h>
+#include <perl.h>
+#endif
+
 #include "clibrary.h"
 #include "innd.h"
 #include "art.h"
 
 #if defined(DO_PERL)
 
-#include <EXTERN.h>
-#include <perl.h>
 #define my_perl PerlCode
 extern PerlInterpreter *PerlCode;
 
diff --git a/nnrpd/perl.c b/nnrpd/perl.c
index acfd8c1..f75eabf 100644
--- a/nnrpd/perl.c
+++ b/nnrpd/perl.c
@@ -19,6 +19,12 @@ static void use_rcsid (const char *rid) {   /* Never called */
 #include <stdio.h>
 #include <sys/types.h>
 #include "configdata.h"
+
+#if defined(DO_PERL)
+#include <EXTERN.h>
+#include <perl.h>
+#endif
+
 #include "clibrary.h"
 #include "paths.h"
 #include "post.h"
@@ -28,8 +34,6 @@ static void use_rcsid (const char *rid) {   /* Never called */
 
 #if defined(DO_PERL)
 
-#include <EXTERN.h>
-#include <perl.h>
 #define my_perl PerlCode
 extern PerlInterpreter *PerlCode;
 
-- 
2.39.1

