From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 9 Feb 2006 23:23:59 +0000 (+0000)
Subject: Change 27136 seems to have inadvertently upset some compilers,
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ce6f1cbce90e089336a9b1ef9c0f6a86b261d30d;p=p5sagit%2Fp5-mst-13.2.git

Change 27136 seems to have inadvertently upset some compilers,
presumably where NULL was defined as 0, not (void *)0

p4raw-id: //depot/perl@27145
---

diff --git a/op.c b/op.c
index 9580c64..9668905 100644
--- a/op.c
+++ b/op.c
@@ -146,14 +146,14 @@ Perl_Slab_Free(pTHX_ void *op)
 }
 #endif
 /*
- * In the following definition, the ", NULL" is just to make the compiler
+ * In the following definition, the ", (OP*)0" is just to make the compiler
  * think the expression is of the right type: croak actually does a Siglongjmp.
  */
 #define CHECKOP(type,o) \
-    ((PL_op_mask && PL_op_mask[type])					\
+    ((PL_op_mask && PL_op_mask[type])				\
      ? ( op_free((OP*)o),					\
 	 Perl_croak(aTHX_ "'%s' trapped by operation mask", PL_op_desc[type]),	\
-	 NULL )						\
+	 (OP*)0 )						\
      : CALL_FPTR(PL_check[type])(aTHX_ (OP*)o))
 
 #define RETURN_UNLIMITED_NUMBER (PERL_INT_MAX / 2)