diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-09-02 19:23:39 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-09-02 19:23:39 (GMT) |
| commit | c8092844b06414629b91a5c2d66c56ce06fd7a2e (patch) | |
| tree | 46b4986c9d328cbe1d84ee14beb971165ff88406 /src | |
| parent | 92aae074ff9115e13295dcc9eb1515ed1d62319c (diff) | |
| parent | cab14369eb0c673ae1970a05353a51b503b9cd31 (diff) | |
| download | Doxygen-c8092844b06414629b91a5c2d66c56ce06fd7a2e.zip Doxygen-c8092844b06414629b91a5c2d66c56ce06fd7a2e.tar.gz Doxygen-c8092844b06414629b91a5c2d66c56ce06fd7a2e.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/doctokenizer.l | 3 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 6c0f13d..3118cfd 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -659,7 +659,8 @@ REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->text = tagName.mid(text_begin,text_end-text_begin); return TK_RCSTAG; } -<St_Para,St_HtmlOnly>"$("{ID}")" { /* environment variable */ +<St_Para,St_HtmlOnly,St_ManOnly,St_LatexOnly,St_RtfOnly,St_XmlOnly,St_DbOnly>"$("{ID}")" | /* environment variable */ +<St_Para,St_HtmlOnly,St_ManOnly,St_LatexOnly,St_RtfOnly,St_XmlOnly,St_DbOnly>"$("{ID}"("{ID}"))" { /* environment variable */ QCString name = &yytext[2]; name = name.left(name.length()-1); QCString value = portable_getenv(name); diff --git a/src/util.cpp b/src/util.cpp index 0d248e1..7b4c1d2 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2591,7 +2591,7 @@ QCString dateToString(bool includeTime) static bool warnedOnce=FALSE; if (!warnedOnce) { - warn_uncond("Environment variable SOURCE_DATA_EPOCH must have a value smaller than or equal to %llu; actual value %llu\n",UINT_MAX,epoch); + warn_uncond("Environment variable SOURCE_DATE_EPOCH must have a value smaller than or equal to %llu; actual value %llu\n",UINT_MAX,epoch); warnedOnce=TRUE; } } |