mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent double definitions of vararg functions

Browse Source 
This fixes a flaw in 29b0ccbf86239e4f179d573e3465722f9c023e08 that
causes warnings about these macros being redefined.
This commit is contained in:
Leon Timmermans 2025-01-15 05:18:59 +01:00
parent 7a1c156a29
commit 48d56f3192
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embed.h
View File

@ -76,7 +76,8 @@
extra argument but grab the context pointer using the macro dTHX.
*/
# if defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES)
# if defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) && \
!defined(PERL_WANT_VARARGS)
# define croak Perl_croak_nocontext
# define deb Perl_deb_nocontext
# define die Perl_die_nocontext
@ -90,7 +91,8 @@
# define sv_setpvf_mg Perl_sv_setpvf_mg_nocontext
# define warn Perl_warn_nocontext
# define warner Perl_warner_nocontext
# endif /* defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) */
# endif /* defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) &&
!defined(PERL_WANT_VARARGS) */
# endif /* !defined(PERL_NOCOMPAT) */
#endif /* !defined(PERL_CORE) */
#if !defined(PERL_NO_SHORT_NAMES)

2
regen/embed.pl
View File

@ -651,7 +651,7 @@ sub generate_embed_h {
provides a set of compatibility functions that don't take an
extra argument but grab the context pointer using the macro dTHX.
*/
#if defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES)
#if defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) && !defined(PERL_WANT_VARARGS)
END
foreach (@nocontext) {