X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.h;h=159d74def8490755be7ee923bf9f8acff018a313;hb=ca62f0fc957407f48588d44995309a50a80e45ab;hp=b77c0a831cd513481d80faa4da26df330bf2b687;hpb=5a47f09b1f37ad670eb23486a6efdb4c448efdfa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/opcode.h b/opcode.h
index b77c0a8..159d74d 100644
--- a/opcode.h
+++ b/opcode.h
@@ -1,7 +1,8 @@
 /*
  *    opcode.h
  *
- *    Copyright (c) 1997-2002, Larry Wall
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, 2003, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -20,10 +21,10 @@
 START_EXTERN_C
 
 
-#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])
+#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])
 
 #ifndef DOINIT
 EXT char *PL_op_name[];
@@ -1614,7 +1615,7 @@ EXT U32 PL_opargs[] = {
 	0x00000248,	/* rv2hv */
 	0x00028404,	/* helem */
 	0x00048801,	/* hslice */
-	0x00022800,	/* unpack */
+	0x00122800,	/* unpack */
 	0x0004280d,	/* pack */
 	0x00222808,	/* split */
 	0x0004280d,	/* join */