branch master updated: Avoid gnulib/Perl definition clash

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 3ed4d45ed4 Avoid gnulib/Perl definition clash
3ed4d45ed4 is described below

commit 3ed4d45ed4ff089a3073fc3f43e0bdcb1232e395
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Apr 5 21:27:42 2023 +0100

    Avoid gnulib/Perl definition clash
    
    * tp/Texinfo/XS/MiscXS.xs,
    * tp/Texinfo/XS/misc.c,
    * tp/Texinfo/XS/parsetexi/Parsetexi.xs,
    * tp/Texinfo/XS/xspara.c [defined _WIN32 && !defined __CYGWIN__]:
    '#undef free' after including "perl.h" and before including
    "XSUB.h" to avoid warnings about redefining symbols in Perl
    headers that Gnulib already redefined.  (Same change made on
    2022-10-22 to other files.)  From Eli and Arash Esbati.
---
 ChangeLog                            | 13 +++++++++++++
 tp/Texinfo/XS/MiscXS.xs              |  3 +++
 tp/Texinfo/XS/misc.c                 |  3 +++
 tp/Texinfo/XS/parsetexi/Parsetexi.xs |  3 +++
 tp/Texinfo/XS/xspara.c               |  3 +++
 5 files changed, 25 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c27a617551..d844368340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-04-05  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Avoid gnulib/Perl definition clash
+
+       * tp/Texinfo/XS/MiscXS.xs,
+       * tp/Texinfo/XS/misc.c,
+       * tp/Texinfo/XS/parsetexi/Parsetexi.xs,
+       * tp/Texinfo/XS/xspara.c [defined _WIN32 && !defined __CYGWIN__]:
+       '#undef free' after including "perl.h" and before including
+       "XSUB.h" to avoid warnings about redefining symbols in Perl
+       headers that Gnulib already redefined.  (Same change made on
+       2022-10-22 to other files.)  From Eli and Arash Esbati.
+
 2023-04-05  Gavin Smith <gavinsmith0123@gmail.com>
 
        intptr_t for KEY_PAIR
diff --git a/tp/Texinfo/XS/MiscXS.xs b/tp/Texinfo/XS/MiscXS.xs
index a8c58cc539..65b6eca2f8 100644
--- a/tp/Texinfo/XS/MiscXS.xs
+++ b/tp/Texinfo/XS/MiscXS.xs
@@ -5,6 +5,9 @@
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
+#if defined _WIN32 && !defined __CYGWIN__
+# undef free
+#endif
 #include "XSUB.h"
 
 #include "ppport.h"
diff --git a/tp/Texinfo/XS/misc.c b/tp/Texinfo/XS/misc.c
index f582a81ee2..6d8fac3c3d 100644
--- a/tp/Texinfo/XS/misc.c
+++ b/tp/Texinfo/XS/misc.c
@@ -37,6 +37,9 @@
 
 #include "EXTERN.h"
 #include "perl.h"
+#if defined _WIN32 && !defined __CYGWIN__
+# undef free
+#endif
 #include "XSUB.h"
 
 #include "ppport.h"
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs 
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 176f162e21..342c40dfaa 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -6,6 +6,9 @@
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
+#if defined _WIN32 && !defined __CYGWIN__
+# undef free
+#endif
 #include "XSUB.h"
 
 #undef context
diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
index 96a4b81a17..d72ef2c8d3 100644
--- a/tp/Texinfo/XS/xspara.c
+++ b/tp/Texinfo/XS/xspara.c
@@ -37,6 +37,9 @@
 
 #include "EXTERN.h"
 #include "perl.h"
+#if defined _WIN32 && !defined __CYGWIN__
+# undef free
+#endif
 #include "XSUB.h"
 
 #include "ppport.h"