Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent double definitions of vararg functions #22917

Open
wants to merge 1 commit into
base: blead
Choose a base branch
from
Open

Prevent double definitions of vararg functions #22917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions embed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion regen/embed.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading