diff options
| author | Tony Cook <tony@develop-help.com> | 2013-07-23 11:36:01 +1000 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2013-07-24 11:43:19 +1000 |
| commit | d1decf2be1b14ef34c794d5aa26039a5d0fd5ccd (patch) | |
| tree | 7a08e88b861b35c2ae32c71e847b50fbaa3946d5 /handy.h | |
| parent | 4a8dd740b55a404b1284797635911b22a8dd7013 (diff) | |
| download | perl-d1decf2be1b14ef34c794d5aa26039a5d0fd5ccd.tar.gz | |
Revert "Remove the non-inline function S_croak_memory_wrap from inline.h."
This reverts commit 43387ee1abcd83c3c7586b7f7aa86e838d239aac.
Which reverted parts of f019c49e380f764c1ead36fe3602184804292711, but that
reversion may no longer be necessary.
See [perl #116989]
Diffstat (limited to 'handy.h')
| -rw-r--r-- | handy.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1612,12 +1612,12 @@ PoisonWith(0xEF) for catching access to freed memory. * (U16)n > (size_t)~0/sizeof(U16) always being false. */ #ifdef PERL_MALLOC_WRAP #define MEM_WRAP_CHECK(n,t) \ - (void)(sizeof(t) > 1 && ((MEM_SIZE)(n)+0.0) > MEM_SIZE_MAX/sizeof(t) && (Perl_croak_memory_wrap(),0)) + (void)(sizeof(t) > 1 && ((MEM_SIZE)(n)+0.0) > MEM_SIZE_MAX/sizeof(t) && (croak_memory_wrap(),0)) #define MEM_WRAP_CHECK_1(n,t,a) \ (void)(sizeof(t) > 1 && ((MEM_SIZE)(n)+0.0) > MEM_SIZE_MAX/sizeof(t) && (Perl_croak_nocontext("%s",(a)),0)) #define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t), -#define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (Perl_croak_memory_wrap(),0):0),((n-1+PERL_STRLEN_ROUNDUP_QUANTUM)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))) +#define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0):0),((n-1+PERL_STRLEN_ROUNDUP_QUANTUM)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1))) #else #define MEM_WRAP_CHECK(n,t) |