[asperl] integrate mainline changes

p4raw-id: //depot/asperl@884

1 files changed, 3 insertions, 3 deletions

diff --git a/regexec.c b/regexec.c
index 7a0e84a0c1..9cac0afc13 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1273,7 +1273,7 @@ regmatch(regnode *prog)
 		    *reglastparen = paren;
 	    }
 #endif 
-	    scan = NEXTOPER(scan) + 4/sizeof(regnode);
+	    scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
 	    if (paren)
 		scan += NEXT_OFF(scan); /* Skip former OPEN. */
 	    reginput = locinput;
@@ -1387,13 +1387,13 @@ regmatch(regnode *prog)
 		*reglastparen = paren;
 	    ln = ARG1(scan);  /* min to match */
 	    n  = ARG2(scan);  /* max to match */
-            scan = regnext(NEXTOPER(scan) + 4/sizeof(regnode));
+            scan = regnext(NEXTOPER(scan) + NODE_STEP_REGNODE);
 	    goto repeat;
 	case CURLY:
 	    paren = 0;
 	    ln = ARG1(scan);  /* min to match */
 	    n  = ARG2(scan);  /* max to match */
-	    scan = NEXTOPER(scan) + 4/sizeof(regnode);
+	    scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
 	    goto repeat;
 	case STAR:
 	    ln = 0;