diff options
author | David Mitchell <davem@iabyn.com> | 2013-01-30 16:37:22 +0000 |
---|---|---|
committer | David Mitchell <davem@iabyn.com> | 2013-01-30 16:37:22 +0000 |
commit | 106d2451aadbd20e554aed6fb9fa741f230dce4b (patch) | |
tree | e5ed599465d10f47d4ed91dafd17430f53d7983d /op.c | |
parent | a03199eaa6f5d9e2d15c64750229e2adeebfbdce (diff) | |
download | perl-106d2451aadbd20e554aed6fb9fa741f230dce4b.tar.gz |
pmruntime(): rename var to avoid macro name clash
[perl #116557]
Apparently MS's WinCE SDK #defines 'leave'. So rename the 'leave' variable
to 'leaveop' to avoid clashes.
Diffstat (limited to 'op.c')
-rw-r--r-- | op.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -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 */ |