X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.h;h=b3da7c3651a0b68a9cc4b7ee75b9c8787279c366;hb=3d3d4f39342abc069c6470bf0947f2d00d3ead72;hp=a8a04399997e6a51d7ff5a40d1449dd9a8077e30;hpb=438c221d2a8e6fa132b664b70062215bf9c6ef42;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/opcode.h b/opcode.h
index a8a0439..b3da7c3 100644
--- a/opcode.h
+++ b/opcode.h
@@ -11,15 +11,11 @@
 
 START_EXTERN_C
 
-#ifdef PERL_CUSTOM_OPS
+
 #define OP_NAME(o) (o->op_type == OP_CUSTOM ? custom_op_name(o) : \
                     PL_op_name[o->op_type])
 #define OP_DESC(o) (o->op_type == OP_CUSTOM ? custom_op_desc(o) : \
                     PL_op_desc[o->op_type])
-#else
-#define OP_NAME(o) PL_op_name[o->op_type]
-#define OP_DESC(o) PL_op_desc[o->op_type]
-#endif
 
 #ifndef DOINIT
 EXT char *PL_op_name[];
@@ -1277,7 +1273,7 @@ EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
 	MEMBER_TO_FPTR(Perl_ck_null),	/* leavesublv */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* caller */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* warn */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* die */
+	MEMBER_TO_FPTR(Perl_ck_die),	/* die */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* reset */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* lineseq */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* nextstate */
@@ -1492,7 +1488,7 @@ EXT U32 PL_opargs[] = {
 	0x00001608,	/* backtick */
 	0x00012808,	/* glob */
 	0x0001d608,	/* readline */
-	0x00001608,	/* rcatline */
+	0x00000c08,	/* rcatline */
 	0x00002204,	/* regcmaybe */
 	0x00002204,	/* regcreset */
 	0x00002604,	/* regcomp */