Straggler from Unicode::Collate.

[perl5.git] / op.h

diff --git a/op.h b/op.h
index ed38438..539393d 100644 (file)
--- a/op.h
+++ b/op.h
@@ -485,14 +485,13 @@ struct loop {
 
 #if defined(PL_OP_SLAB_ALLOC)
 #define NewOp(m,var,c,type)    \
-       STMT_START {            \
-               var = (type *) Perl_Slab_Alloc(aTHX_ m,c*sizeof(type));\
-       } STMT_END
+       (var = (type *) Perl_Slab_Alloc(aTHX_ m,c*sizeof(type)))
 #define NewOpSz(m,var,size)    \
-       STMT_START { var = (OP *) Perl_Slab_Alloc(aTHX_ m,size); } STMT_END
+       (var = (OP *) Perl_Slab_Alloc(aTHX_ m,size))
 #define FreeOp(p) Perl_Slab_Free(aTHX_ p)
 #else
 #define NewOp(m, var, c, type) Newz(m, var, c, type)
-#define NewOpSz(m, var, size) Newz(m, (char*)var, size, char)
+#define NewOpSz(m, var, size)  \
+       (var = (OP*)safemalloc(size), memzero(var, size))
 #define FreeOp(p) Safefree(p)
 #endif