In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/296f0d566b9f3ad1885ae7493caaffbd0cf2eada?hp=9efda33a86bb90e4838144d230a4fc3ae4d63d7d>
- Log ----------------------------------------------------------------- commit 296f0d566b9f3ad1885ae7493caaffbd0cf2eada Author: Tony Cook <[email protected]> Date: Tue Feb 10 11:24:22 2015 +1100 [perl #123554] fix threaded builds and prevent a warning ----------------------------------------------------------------------- Summary of changes: util.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/util.c b/util.c index c92ed2e..9ffdbde 100644 --- a/util.c +++ b/util.c @@ -180,11 +180,18 @@ Perl_safesysmalloc(MEM_SIZE size) } else { +#ifdef USE_MDH out_of_memory: - if (PL_nomemok) - ptr = NULL; - else - croak_no_mem(); +#endif + { +#ifndef ALWAYS_NEED_THX + dTHX; +#endif + if (PL_nomemok) + ptr = NULL; + else + croak_no_mem(); + } } return ptr; } @@ -297,11 +304,18 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) realloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); if (ptr == NULL) { +#ifdef USE_MDH out_of_memory: - if (PL_nomemok) - ptr = NULL; - else - croak_no_mem(); +#endif + { +#ifndef ALWAYS_NEED_THX + dTHX; +#endif + if (PL_nomemok) + ptr = NULL; + else + croak_no_mem(); + } } } return ptr; -- Perl5 Master Repository
