summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-02-18 21:34:02 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-02-18 21:34:02 (GMT)
commit9793ce49f1d7641854ef0608b34c1dd2d4891a20 (patch)
tree714079396631ac6488c45cce3d6acfb51e31f9a8 /src/doxygen.cpp
parentb698431e32befbc1d4e2196dc96b0507ed8ab15a (diff)
downloadDoxygen-9793ce49f1d7641854ef0608b34c1dd2d4891a20.zip
Doxygen-9793ce49f1d7641854ef0608b34c1dd2d4891a20.tar.gz
Doxygen-9793ce49f1d7641854ef0608b34c1dd2d4891a20.tar.bz2
Release-1.2.14
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index dd39762..1168e25 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * $Id$
+ *
*
*
* Copyright (C) 1997-2002 by Dimitri van Heesch.
@@ -1294,9 +1294,14 @@ static MemberDef *addVariableToFile(
MemberDef *md;
for (mni.toFirst();(md=mni.current());++mni)
{
- if ((nd==0 && md->getFileDef() &&
- root->fileName==md->getFileDef()->absFilePath())
- || (nd!=0 && md->getNamespaceDef()==nd))
+ if (
+ ((nd==0 && md->getFileDef() &&
+ root->fileName==md->getFileDef()->absFilePath()
+ )
+ || (nd!=0 && md->getNamespaceDef()==nd)
+ )
+ && !md->isDefine() // function style #define's can be "overloaded" by typedefs or variables
+ )
// variable already in the scope
{
addMemberDocs(root,md,def,0,FALSE);