summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-02-25 12:10:20 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-02-25 12:10:20 (GMT)
commit2920e034fc940f38fc7162abdb3a082ef56bf04c (patch)
tree64233afd72af5813d2dc2f96cf33c2a64ef2280d /src/pre.l
parent7c8994e18b57586f116ee223da9bac35b4262570 (diff)
downloadDoxygen-2920e034fc940f38fc7162abdb3a082ef56bf04c.zip
Doxygen-2920e034fc940f38fc7162abdb3a082ef56bf04c.tar.gz
Doxygen-2920e034fc940f38fc7162abdb3a082ef56bf04c.tar.bz2
issue #6856 Doxygen only expands macro defined in header file once when referred multiple times
In case the include file is already is already in the global stack it should not be added to the global stack, but still be handled for the current file
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/pre.l b/src/pre.l
index 5eb0c5c..18061f6 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -464,13 +464,10 @@ 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)
{
- alreadyIncluded = TRUE;
- //printf(" already included 1\n");
- return 0; // already done
+ g_allIncludes.insert(absName,(void *)0x8);
}
- g_allIncludes.insert(absName,(void *)0x8);
}
// check include stack for absName