X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5f66b61cbe1f2ea985f00c0d9a66153e7a3b6ee1..9f985e4c436303340569d267e23865fa9c16fba7:/cop.h

diff --git a/cop.h b/cop.h
index f0429b1..ef92d8e 100644
--- a/cop.h
+++ b/cop.h
@@ -237,7 +237,7 @@ struct block_sub {
     GV *	dfoutgv;
     AV *	savearray;
     AV *	argarray;
-    long	olddepth;
+    I32		olddepth;
     U8		hasargs;
     U8		lval;		/* XXX merge lval and hasargs? */
     PAD		*oldcomppad;
@@ -254,8 +254,8 @@ struct block_sub {
 	cx->blk_sub.hasargs = hasargs;					\
 	cx->blk_sub.retop = NULL;					\
 	if (!CvDEPTH(cv)) {						\
-	    (void)SvREFCNT_inc(cv);					\
-	    (void)SvREFCNT_inc(cv);					\
+	    SvREFCNT_inc_void(cv);					\
+	    SvREFCNT_inc_void(cv);					\
 	    SAVEFREESV(cv);						\
 	}
 
@@ -277,7 +277,7 @@ struct block_sub {
 	cx->blk_sub.retop = NULL;					\
 	cx->blk_sub.hasargs = 0;					\
 	cx->blk_sub.dfoutgv = PL_defoutgv;				\
-	(void)SvREFCNT_inc(cx->blk_sub.dfoutgv)
+	SvREFCNT_inc_void(cx->blk_sub.dfoutgv)
 
 #define POP_SAVEARRAY()						\
     STMT_START {							\
@@ -542,7 +542,7 @@ struct subst {
 	cx->sb_s		= s,					\
 	cx->sb_m		= m,					\
 	cx->sb_strend		= strend,				\
-	cx->sb_rxres		= Null(void*),				\
+	cx->sb_rxres		= NULL,					\
 	cx->sb_rx		= rx,					\
 	cx->cx_type		= CXt_SUBST;				\
 	rxres_save(&cx->sb_rxres, rx)