summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-06-11 07:58:28 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-06-11 07:58:28 (GMT)
commit07ee85ebcc91a12df8a92078f33e700e5f9f40e8 (patch)
tree30cd22ecad5caf15fa470d190298c4e98b02e971 /src/pre.l
parentde0997f3baf049e0c312ac4fc9b9b762fdc40e00 (diff)
downloadDoxygen-07ee85ebcc91a12df8a92078f33e700e5f9f40e8.zip
Doxygen-07ee85ebcc91a12df8a92078f33e700e5f9f40e8.tar.gz
Doxygen-07ee85ebcc91a12df8a92078f33e700e5f9f40e8.tar.bz2
Release-1.4.7
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pre.l b/src/pre.l
index b4a3787..672104f 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1872,7 +1872,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
outputArray(yytext,yyleng);
BEGIN(g_condCtx);
}
-<SkipCComment,SkipCPPComment>[\\@]"cond"[ \t]+\n |
+<SkipCComment,SkipCPPComment>[\\@]"cond"[ \t\r]*\n |
<CondLine>. {
outputArray(yytext,yyleng);
startCondSection(" ");
@@ -1943,7 +1943,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
<SkipCPPComment>"//" {
outputChar('/');outputChar('/');
}
-<SkipCPPComment>[^\x06\n]+ {
+<SkipCPPComment>[^\x06\@\\\n]+ {
outputArray(yytext,yyleng);
}
<SkipCPPComment>. {