Merge pull request #6903 from doxygen/revert-6859-feature/issue_6856

Revert "issue #6856 Doxygen only expands macro defined in header file once when referred multiple times"

1 files changed, 5 insertions, 2 deletions

diff --git a/src/pre.l b/src/pre.l
index 6edc766..6ae379a 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -464,10 +464,13 @@ static FileState *checkAndOpenFile(const QCString &fileName,bool &alreadyInclude
     // global guard
     if (g_curlyCount==0) // not #include inside { ... }
     {
-      if (g_allIncludes.find(absName)==0)
+      if (g_allIncludes.find(absName)!=0)
       {
-        g_allIncludes.insert(absName,(void *)0x8);
+        alreadyIncluded = TRUE;
+        //printf("  already included 1\n");
+        return 0; // already done
       }
+      g_allIncludes.insert(absName,(void *)0x8);
     }
     // check include stack for absName