summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-08-04 11:52:39 (GMT)
committerGitHub <noreply@github.com>2019-08-04 11:52:39 (GMT)
commit8b20fb3f9fabe44582a73309762620a981281a0f (patch)
treebb935abf823dde8a34b9674753823eb511c6b2ee
parent300440178962a0c4b9c5a52b449a68777da67c7b (diff)
parent58d02ef7fc36b48b2d3783dd848e402b1fa9707f (diff)
downloadDoxygen-8b20fb3f9fabe44582a73309762620a981281a0f.zip
Doxygen-8b20fb3f9fabe44582a73309762620a981281a0f.tar.gz
Doxygen-8b20fb3f9fabe44582a73309762620a981281a0f.tar.bz2
Merge pull request #7097 from albert-github/featre/bug_437181
Bug 437181 - The -d Preprocessor option doesn't work for php, should be in the doc.
-rw-r--r--doc/preprocessing.doc4
-rw-r--r--src/scanner.l2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/preprocessing.doc b/doc/preprocessing.doc
index 882e60d..a49b889 100644
--- a/doc/preprocessing.doc
+++ b/doc/preprocessing.doc
@@ -264,6 +264,10 @@ preprocessing has been done (Hint: set <code>QUIET = YES</code> and
<code>WARNINGS = NO</code> in the configuration file to disable any other
output).
+Note preprocessing is not done for all languages. Preprocesing is enabled for files
+that use the "C" scanner (with the exception of 'java', 'd' and 'php'), Fortran files
+(only in case the extension contains at least one upper case character) and vhdl files.
+
\htmlonly
Go to the <a href="autolink.html">next</a> section or return to the
<a href="index.html">index</a>.
diff --git a/src/scanner.l b/src/scanner.l
index 615c92f..d7fbd4a 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -7468,7 +7468,7 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension)
SrcLangExt lang = getLanguageFromFileName(extension);
return (SrcLangExt_Cpp == lang) ||
!( fe==".java" || fe==".as" || fe==".d" || fe==".php" ||
- fe==".php4" || fe==".inc" || fe==".phtml"
+ fe==".php4" || fe==".inc" || fe==".phtml"|| fe==".php5"
);
}