summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-03-28 19:52:51 (GMT)
committerGitHub <noreply@github.com>2019-03-28 19:52:51 (GMT)
commitde8fd6e44fd4a3c25f84b81dddbb911966879707 (patch)
tree3fec7b1a268bf3f896960f8da8540a4b1ac527d3
parent424985d0766971c8a9b7dd386edb19bf0eed10fb (diff)
downloadDoxygen-de8fd6e44fd4a3c25f84b81dddbb911966879707.zip
Doxygen-de8fd6e44fd4a3c25f84b81dddbb911966879707.tar.gz
Doxygen-de8fd6e44fd4a3c25f84b81dddbb911966879707.tar.bz2
Revert "issue #6856 Doxygen only expands macro defined in header file once when referred multiple times"
-rw-r--r--src/pre.l7
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