summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-02-27 21:44:28 (GMT)
committerGitHub <noreply@github.com>2020-02-27 21:44:28 (GMT)
commit45b9fd69751d6fe4410c98adf9bd7ef15fa136c1 (patch)
treeb862024a5000829c4f41dd450181e6b5f4b75675
parent9faa7bdc0d6231e96a83f1f6400a982307fdab2d (diff)
parent5a0cfa3bd29d8643c7744d03d8fba4ae990aa260 (diff)
downloadDoxygen-45b9fd69751d6fe4410c98adf9bd7ef15fa136c1.zip
Doxygen-45b9fd69751d6fe4410c98adf9bd7ef15fa136c1.tar.gz
Doxygen-45b9fd69751d6fe4410c98adf9bd7ef15fa136c1.tar.bz2
Merge pull request #7619 from albert-github/feature/bug_config_predefined_plus
Problem in case using PREDEFINED with comma and using +=
-rw-r--r--src/configimpl.l9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/configimpl.l b/src/configimpl.l
index dfdeb4a..4ea877b 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -832,7 +832,14 @@ static void readIncludeFile(const char *incName)
case ConfigOption::O_List:
l = ((ConfigList *)option)->valueRef();
elemStr="";
- BEGIN(GetStrList);
+ if (cmd == "PREDEFINED")
+ {
+ BEGIN(GetStrList1);
+ }
+ else
+ {
+ BEGIN(GetStrList);
+ }
break;
case ConfigOption::O_Enum:
case ConfigOption::O_String: