regexec.c: Clean up debug call

The code this replaces relies on the internal structure of a macro,
which can change and break things.  This commit changes to use a more
straight forward way of accomplishing the same thing.

1 files changed, 5 insertions, 3 deletions

diff --git a/regexec.c b/regexec.c
index 925a04816b..2f993a3bc1 100644
--- a/regexec.c
+++ b/regexec.c
@@ -9212,8 +9212,10 @@ NULL
 	/* push a new regex state, then continue at scan  */
 	{
 	    regmatch_state *newst;
+            DECLARE_AND_GET_RE_DEBUG_FLAGS;
 
-	    DEBUG_STACK_r({
+            DEBUG_r( /* DEBUG_STACK_r */
+              if (DEBUG_v_TEST || RE_DEBUG_FLAG(RE_DEBUG_EXTRA_STACK)) {
 	        regmatch_state *cur = st;
 	        regmatch_state *curyes = yes_state;
 	        U32 i;
@@ -9232,9 +9234,9 @@ NULL
                     if (curyes == cur)
 	                curyes = cur->u.yes.prev_yes_state;
                 }
-            } else 
+            } else {
                 DEBUG_STATE_pp("push")
-            );
+            });
 	    depth++;
 	    st->locinput = locinput;
 	    st->loceol = loceol;