[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Sat, 22 Oct 2022 15:59:28 -0400 (EDT) |
branch: master
commit 5edc09c5bd77359a867cf730052f455c43a54d0c
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 22 20:59:17 2022 +0100
* tp/Texinfo/XS/XSParagraph.xs,
* tp/Texinfo/XS/parsetexi/api.c
[defined _WIN32 && !defined __CYGWIN__]:
'#undef free' after including "perl.h" (which includes stdlib.h
from Gnulib) and before including "XSUB.h" to avoid warnings
about redefining symbols in Perl headers that Gnulib already
redefined. From Eli.
---
ChangeLog | 18 ++++++++++--------
tp/Texinfo/XS/XSParagraph.xs | 5 +++++
tp/Texinfo/XS/parsetexi/api.c | 5 +++++
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d66c38ea52..9f7ba6b46e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-10-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/XS/XSParagraph.xs,
+ * tp/Texinfo/XS/parsetexi/api.c
+ [defined _WIN32 && !defined __CYGWIN__]:
+ '#undef free' after including "perl.h" (which includes stdlib.h
+ from Gnulib) and before including "XSUB.h" to avoid warnings
+ about redefining symbols in Perl headers that Gnulib already
+ redefined. From Eli.
+
2022-10-22 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/XS/configure.ac: Attempt to disable gnulib
@@ -8,14 +18,6 @@
* doc/texinfo.texi (Minimum): Minor grammar fix.
-2022-10-22 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/Texinfo/XS/XSParagraph.xs,
- * tp/Texinfo/XS/parsetexi/api.c
- [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..27e10e0309 100644
--- a/tp/Texinfo/XS/XSParagraph.xs
+++ b/tp/Texinfo/XS/XSParagraph.xs
@@ -5,6 +5,11 @@
#define PERL_NO_GET_CONTEXT
#include "EXTERN.h"
#include "perl.h"
+/* Avoid warnings about Perl headers redefining symbols that gnulib
+ redefined already. */
+#if defined _WIN32 && !defined __CYGWIN__
+ #undef free
+#endif
#include "XSUB.h"
#include "ppport.h"
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 31227ae0a4..0178732d72 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -21,6 +21,11 @@
#define PERL_NO_GET_CONTEXT
#include "EXTERN.h"
#include "perl.h"
+/* Avoid warnings about Perl headers redefining symbols that gnulib
+ redefined already. */
+#if defined _WIN32 && !defined __CYGWIN__
+ #undef free
+#endif
#include "XSUB.h"
#undef context