summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-11-22 12:58:59 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-11-22 13:00:40 (GMT)
commit8c51120ad55b440b738ef0b96f8169d84a7ae88a (patch)
tree86255cce94958b0e38fb4ce24e2de0031362790b /src/commentscan.l
parentcf936efb8ae99dd297b6afb9c6a06beb81f5b0fb (diff)
downloadDoxygen-8c51120ad55b440b738ef0b96f8169d84a7ae88a.zip
Doxygen-8c51120ad55b440b738ef0b96f8169d84a7ae88a.tar.gz
Doxygen-8c51120ad55b440b738ef0b96f8169d84a7ae88a.tar.bz2
Support 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 2629857..ffed075 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_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MAJOR_VERSION>=2 && (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_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+#if YY_FLEX_MAJOR_VERSION>=2 && (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);