Skip to content

Adapt malloc.c to croak/warn now being defined under multiplicity #20286 #20301

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

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Adapt malloc.c to croak/warn now being defined under multiplicity #20286 #20301

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: 1 addition & 5 deletions malloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,9 @@
#define PERL_IN_MALLOC_C
#include "perl.h"
#if defined(MULTIPLICITY)
# define croak Perl_croak_nocontext
# define croak2 Perl_croak_nocontext
# define warn Perl_warn_nocontext
# define warn2 Perl_warn_nocontext
#else
# define croak2 croak
# define warn2 warn
#endif
#ifdef USE_ITHREADS
# define PERL_MAYBE_ALIVE PL_thr_key
Expand Down Expand Up @@ -1708,7 +1704,7 @@ morecore(int bucket)
#endif
if (bucket == sizeof(MEM_SIZE)*8*BUCKETS_PER_POW2) {
MALLOC_UNLOCK;
croak("%s", "Out of memory during ridiculously large request");
croak2("%s", "Out of memory during ridiculously large request");
}
if (bucket > max_bucket)
max_bucket = bucket;
Expand Down