[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Consolidate "#undef free" comment.
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Consolidate "#undef free" comment. |
|
Date: |
Sun, 03 Mar 2024 07:29:01 -0500 |
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 f85c6a017b Consolidate "#undef free" comment.
f85c6a017b is described below
commit f85c6a017b667e210d02f8e5ba3e8ae954298751
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Mar 3 12:24:43 2024 +0000
Consolidate "#undef free" comment.
* tp/Texinfo/XS/XSParagraph.xs,
* tp/Texinfo/XS/MiscXS.xs,
* tp/Texinfo/XS/convert/ConvertXS.xs,
* tp/Texinfo/XS/convert/build_html_perl_state.c,
* tp/Texinfo/XS/convert/call_html_perl_function.c,
* tp/Texinfo/XS/convert/get_html_perl_info.c,
* tp/Texinfo/XS/main/api_to_perl.c,
* tp/Texinfo/XS/misc.c,
* tp/Texinfo/XS/parsetexi/Parsetexi.xs,
* tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs,
* tp/Texinfo/XS/xspara.c:
Refer to comment in XSParagraph.xs for why we "#undef free" and
expand on this comment.
---
ChangeLog | 18 ++++++++++++++++++
tp/Texinfo/XS/MiscXS.xs | 1 +
tp/Texinfo/XS/XSParagraph.xs | 8 ++++++--
tp/Texinfo/XS/convert/ConvertXS.xs | 1 +
tp/Texinfo/XS/convert/build_html_perl_state.c | 3 +--
tp/Texinfo/XS/convert/call_html_perl_function.c | 3 +--
tp/Texinfo/XS/convert/get_html_perl_info.c | 3 +--
tp/Texinfo/XS/main/api_to_perl.c | 3 +--
tp/Texinfo/XS/misc.c | 1 +
tp/Texinfo/XS/parsetexi/Parsetexi.xs | 1 +
.../XS/structuring_transfo/StructuringTransfoXS.xs | 1 +
tp/Texinfo/XS/xspara.c | 1 +
12 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fe11b4aa5d..51f3558791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2024-03-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Consolidate "#undef free" comment.
+
+ * tp/Texinfo/XS/XSParagraph.xs,
+ * tp/Texinfo/XS/MiscXS.xs,
+ * tp/Texinfo/XS/convert/ConvertXS.xs,
+ * tp/Texinfo/XS/convert/build_html_perl_state.c,
+ * tp/Texinfo/XS/convert/call_html_perl_function.c,
+ * tp/Texinfo/XS/convert/get_html_perl_info.c,
+ * tp/Texinfo/XS/main/api_to_perl.c,
+ * tp/Texinfo/XS/misc.c,
+ * tp/Texinfo/XS/parsetexi/Parsetexi.xs,
+ * tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs,
+ * tp/Texinfo/XS/xspara.c:
+ Refer to comment in XSParagraph.xs for why we "#undef free" and
+ expand on this comment.
+
2024-03-03 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/convert_html.h (initialize_cmd_list): fix
diff --git a/tp/Texinfo/XS/MiscXS.xs b/tp/Texinfo/XS/MiscXS.xs
index 0916c6b79f..6a1d655d20 100644
--- a/tp/Texinfo/XS/MiscXS.xs
+++ b/tp/Texinfo/XS/MiscXS.xs
@@ -21,6 +21,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/XSParagraph.xs b/tp/Texinfo/XS/XSParagraph.xs
index ae77df7506..e5365b124a 100644
--- a/tp/Texinfo/XS/XSParagraph.xs
+++ b/tp/Texinfo/XS/XSParagraph.xs
@@ -20,9 +20,13 @@
#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__
+/* For Perl on MS-Windows, it is possible for the header XSUB.h to redefine
+ 'free' (to something like "PerlMem_free"). 'free' was already defined
+ by gnulib, in config.h (due to the 'free-posix' module which was
+ brought in as a dependency of other gnulib modules). We need the Perl
+ redefinition, not the gnulib version. The #undef line here prevents
+ a warning about the symbol being redefined. */
#undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index bbb35c7880..d53db1cd3e 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -24,6 +24,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index d4cdf39c8e..fcc898b3db 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -21,9 +21,8 @@
#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__
+/* See comment in XSParagraph.xs for why we #undef free. */
#undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index af91184285..02e95e8d99 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -21,9 +21,8 @@
#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__
+/* See comment in XSParagraph.xs for why we #undef free. */
#undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/convert/get_html_perl_info.c
b/tp/Texinfo/XS/convert/get_html_perl_info.c
index f302b50939..1400332fb6 100644
--- a/tp/Texinfo/XS/convert/get_html_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_html_perl_info.c
@@ -21,9 +21,8 @@
#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__
+/* See comment in XSParagraph.xs for why we #undef free. */
#undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/main/api_to_perl.c b/tp/Texinfo/XS/main/api_to_perl.c
index 85a120fcd2..8195ef56f7 100644
--- a/tp/Texinfo/XS/main/api_to_perl.c
+++ b/tp/Texinfo/XS/main/api_to_perl.c
@@ -21,9 +21,8 @@
#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__
+/* See comment in XSParagraph.xs for why we #undef free. */
#undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/misc.c b/tp/Texinfo/XS/misc.c
index 2ac2b96d62..de62bbfb94 100644
--- a/tp/Texinfo/XS/misc.c
+++ b/tp/Texinfo/XS/misc.c
@@ -38,6 +38,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 340dcd511c..f98a62e131 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -22,6 +22,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
index 8d24f8cef0..3373cd73cd 100644
--- a/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
+++ b/tp/Texinfo/XS/structuring_transfo/StructuringTransfoXS.xs
@@ -22,6 +22,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
index 707361ae16..8f486e71b3 100644
--- a/tp/Texinfo/XS/xspara.c
+++ b/tp/Texinfo/XS/xspara.c
@@ -32,6 +32,7 @@
#include "EXTERN.h"
#include "perl.h"
#if defined _WIN32 && !defined __CYGWIN__
+/* See comment in XSParagraph.xs for why we #undef free. */
# undef free
#endif
#include "XSUB.h"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Consolidate "#undef free" comment.,
Gavin D. Smith <=