diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2010-11-18 21:50:39 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2010-11-18 21:50:39 (GMT) |
| commit | dd7602fdd31d8f3e0f88be553da084a1e3fdec45 (patch) | |
| tree | a6d2454b4e6d53003fa829bb7134fe373461ed97 /src/pre.l | |
| parent | be602ee76006d9b8b0f6e5e75114f2ce34f7773e (diff) | |
| download | Doxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.zip Doxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.tar.gz Doxygen-dd7602fdd31d8f3e0f88be553da084a1e3fdec45.tar.bz2 | |
Release-1.7.2-20101118
Diffstat (limited to 'src/pre.l')
| -rw-r--r-- | src/pre.l | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1300,10 +1300,10 @@ static void readIncludeFile(const QCString &inc) QCString absPath = incFileName; if (QDir::isRelativePath(incFileName)) { - QString absPath = QDir::cleanDirPath(oldFileDef->getPath()+"/"+incFileName); + absPath = QDir::cleanDirPath(oldFileDef->getPath()+"/"+incFileName); //printf("%s + %s -> resolved path %s\n",oldFileDef->getPath().data(),incFileName.data(),absPath.data()); } - FileDef *fd = findFileDef(Doxygen::inputNameDict,incFileName,ambig); + FileDef *fd = findFileDef(Doxygen::inputNameDict,absPath,ambig); //printf("%s::findFileDef(%s)=%p\n",oldFileDef->name().data(),incFileName.data(),fd); // add include dependency to the file in which the #include was found oldFileDef->addIncludeDependency(fd,incFileName,localInclude,g_isImported); @@ -2130,8 +2130,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } <SkipCComment,SkipCPPComment>[\\@]"cond"[ \t\r]*\n | <CondLine>. { - outputArray(yytext,yyleng); - g_yyLineNr+=QCString(yytext).contains('\n'); + unput(*yytext); startCondSection(" "); if (YY_START==CondLine) BEGIN(g_condCtx); } |