summaryrefslogtreecommitdiff
path: root/handy.h
diff options
context:
space:
mode:
authorAndy Lester <andy@petdance.com>2005-12-27 08:39:39 -0600
committerSteve Peters <steve@fisharerojo.org>2005-12-27 22:07:44 +0000
commitfabdb6c0879db76333e970b6c67260c877fc17b3 (patch)
tree81d106dc99b2069f6968bbe00164e6bb222dc482 /handy.h
parentf319e147b252268cc6fe404c58538ec32cf8548a (diff)
downloadperl-fabdb6c0879db76333e970b6c67260c877fc17b3.tar.gz
pre-likely cleanup
Message-ID: <20051227203939.GC1781@petdance.com> Includes a small fix to the changes in tryAMAGICbinW_var() in pp.h. p4raw-id: //depot/perl@26505
Diffstat (limited to 'handy.h')
-rw-r--r--handy.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/handy.h b/handy.h
index 42a1797786..fb11132539 100644
--- a/handy.h
+++ b/handy.h
@@ -618,12 +618,9 @@ hopefully catches attempts to access uninitialized memory.
#define NEWSV(x,len) newSV(len)
#ifdef PERL_MALLOC_WRAP
-#define MEM_WRAP_CHECK(n,t) \
- (void)((sizeof(t)>1?(n):1)>((MEM_SIZE)~0)/sizeof(t)?(Perl_croak_nocontext(PL_memory_wrap),0):0)
+#define MEM_WRAP_CHECK(n,t) MEM_WRAP_CHECK_1(n,t,PL_memory_wrap)
#define MEM_WRAP_CHECK_1(n,t,a) \
(void)((sizeof(t)>1?(n):1)>((MEM_SIZE)~0)/sizeof(t)?(Perl_croak_nocontext(a),0):0)
-#define MEM_WRAP_CHECK_2(n,t,a,b) \
- (void)((sizeof(t)>1?(n):1)>((MEM_SIZE)~0)/sizeof(t)?(Perl_croak_nocontext(a,b),0):0)
#define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t),
#define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > (MEM_SIZE)~0 - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (Perl_croak_nocontext(PL_memory_wrap),0):0),((n-1+PERL_STRLEN_ROUNDUP_QUANTUM)&~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM-1)))