summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorHeiko Becker <heirecka@exherbo.org>2015-11-19 11:00:54 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-11-22 13:00:40 (GMT)
commitcf936efb8ae99dd297b6afb9c6a06beb81f5b0fb (patch)
tree86557ace1e35bd93cd0777c6d391fc853dd7b908 /src/commentscan.l
parent499ecaedf1ee1222535be27f77050ee633595685 (diff)
downloadDoxygen-cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.zip
Doxygen-cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.tar.gz
Doxygen-cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.tar.bz2
Support flex-2.6.0
The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not take YY_FLEX_MINOR_VERSION into account, which made them fail with flex-2.6.0.
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index cf892a0..2629857 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
// but we need to know the position in the input buffer where this
// rule matched.
// for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
#else
inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
g_memberGroupHeader.resize(0);
parseMore=TRUE;
needNewEntry = TRUE;
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
#else
inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);