Merge pull request #8120 from BetsyMcPhail/expand-nonrecursive-macro

Expand non-recursive preprocessor macros

1 files changed, 4 insertions, 0 deletions

diff --git a/src/pre.l b/src/pre.l
index 04622bc..4a86562 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2416,6 +2416,10 @@ static bool expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
 	    expanded = expandExpression(yyscanner,resultExpr,&restExpr,0,level+1);
 	    state->expandedDict.erase(toStdString(macroName));
 	  }
+    else if (def && def->nonRecursive)
+    {
+      expanded = true;
+    }
           if (expanded)
           {
 	    expr=expr.left(p)+resultExpr+restExpr;