branch master updated: * tp/Texinfo/XS/XSParagraph.xs, * tp/Texinfo/XS/parsertexi/XSParagraph.xs [defined _WIN32 && !defined __CYGWIN__]: Add block of #undef to avoid warnings about redefining symbols in Perl headers that Gnulib already redefined. From Eli.

[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 5c1874da10 * tp/Texinfo/XS/XSParagraph.xs, * 
tp/Texinfo/XS/parsertexi/XSParagraph.xs [defined _WIN32 && !defined 
__CYGWIN__]: Add block of #undef to avoid warnings about redefining symbols in 
Perl headers that Gnulib already redefined.  From Eli.
5c1874da10 is described below

commit 5c1874da10e984e97d87ac18afd5064aa10339ce
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 22 19:35:21 2022 +0100

    * tp/Texinfo/XS/XSParagraph.xs,
    * tp/Texinfo/XS/parsertexi/XSParagraph.xs
    [defined _WIN32 && !defined __CYGWIN__]:
    Add block of #undef to avoid warnings about redefining symbols
    in Perl headers that Gnulib already redefined.  From Eli.
---
 ChangeLog                     |  8 ++++++++
 tp/Texinfo/XS/XSParagraph.xs  | 11 ++++++++++-
 tp/Texinfo/XS/parsetexi/api.c |  9 +++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 029a2bbae7..f1b9b23621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-10-22  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/XSParagraph.xs,
+       * tp/Texinfo/XS/parsertexi/XSParagraph.xs
+       [defined _WIN32 && !defined __CYGWIN__]:
+       Add block of #undef to avoid warnings about redefining symbols
+       in Perl headers that Gnulib already redefined.  From Eli.
+
 2022-10-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_parse_line_command_args): set
diff --git a/tp/Texinfo/XS/XSParagraph.xs b/tp/Texinfo/XS/XSParagraph.xs
index 9c17032cdf..70cabd7bad 100644
--- a/tp/Texinfo/XS/XSParagraph.xs
+++ b/tp/Texinfo/XS/XSParagraph.xs
@@ -2,6 +2,15 @@
   #include <config.h>
 #endif
 
+/* Avoid warnings about Perl headers redefining symbols that gnulib
+   redefined already. */
+#if defined _WIN32 && !defined __CYGWIN__
+  #undef putenv
+  #undef fdopen
+  #undef mktemp
+  #undef free
+#endif
+
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
@@ -13,7 +22,7 @@
 
 MODULE = Texinfo::Convert::Paragraph PACKAGE = Texinfo::Convert::Paragraph 
PREFIX = xspara_
 
-#  Copyright 2010-2020 Free Software Foundation, Inc.
+#  Copyright 2010-2022 Free Software Foundation, Inc.
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 31227ae0a4..e06dd56467 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -15,6 +15,15 @@
 
 #include <config.h>
 
+/* Avoid warnings about Perl headers redefining symbols that gnulib
+   redefined already. */
+#if defined _WIN32 && !defined __CYGWIN__
+  #undef putenv
+  #undef fdopen
+  #undef mktemp
+  #undef free
+#endif
+
 /* Avoid namespace conflicts. */
 #define context perl_context