pmruntime(): rename var to avoid macro name clash
authorDavid Mitchell <davem@iabyn.com>
Wed, 30 Jan 2013 16:37:22 +0000 (16:37 +0000)
committerDavid Mitchell <davem@iabyn.com>
Wed, 30 Jan 2013 16:37:22 +0000 (16:37 +0000)
[perl #116557]

Apparently MS's WinCE SDK #defines 'leave'. So rename the 'leave' variable
to 'leaveop' to avoid clashes.

op.c

index 51f40cd..edc2362 100644 (file)
--- a/op.c
+++ b/op.c
@@ -4556,16 +4556,16 @@ Perl_pmruntime(pTHX_ OP *o, OP *expr, bool isreg, I32 floor)
            scalar(o);
            LINKLIST(o);
            if (cLISTOPo->op_first->op_type == OP_LEAVE) {
-               LISTOP *leave = cLISTOPx(cLISTOPo->op_first);
+               LISTOP *leaveop = cLISTOPx(cLISTOPo->op_first);
                /* skip ENTER */
-               assert(leave->op_first->op_type == OP_ENTER);
-               assert(leave->op_first->op_sibling);
-               o->op_next = leave->op_first->op_sibling;
-               /* skip LEAVE */
-               assert(leave->op_flags & OPf_KIDS);
-               assert(leave->op_last->op_next = (OP*)leave);
-               leave->op_next = NULL; /* stop on last op */
-               op_null((OP*)leave);
+               assert(leaveop->op_first->op_type == OP_ENTER);
+               assert(leaveop->op_first->op_sibling);
+               o->op_next = leaveop->op_first->op_sibling;
+               /* skip leave */
+               assert(leaveop->op_flags & OPf_KIDS);
+               assert(leaveop->op_last->op_next = (OP*)leaveop);
+               leaveop->op_next = NULL; /* stop on last op */
+               op_null((OP*)leaveop);
            }
            else {
                /* skip SCOPE */