diff options
Diffstat (limited to 'recipes-devtools/doxygen/doxygen/patch-flex_2_6_0.diff')
-rw-r--r-- | recipes-devtools/doxygen/doxygen/patch-flex_2_6_0.diff | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/recipes-devtools/doxygen/doxygen/patch-flex_2_6_0.diff b/recipes-devtools/doxygen/doxygen/patch-flex_2_6_0.diff deleted file mode 100644 index 36d73798..00000000 --- a/recipes-devtools/doxygen/doxygen/patch-flex_2_6_0.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- src/code.l.orig -+++ src/code.l -@@ -3695,7 +3695,7 @@ void codeFreeScanner() - extern "C" { // some bogus code to keep the compiler happy - void codeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - ---- src/commentscan.l.orig -+++ src/commentscan.l -@@ -1098,7 +1098,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_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); -@@ -1160,7 +1160,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_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); - ---- src/fortrancode.l.orig -+++ src/fortrancode.l -@@ -1289,7 +1289,7 @@ void parseFortranCode(CodeOutputInterfac - extern "C" { // some bogus code to keep the compiler happy - void fortrancodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #else - extern "C" { // some bogus code to keep the compiler happy - ---- src/pycode.l.orig -+++ src/pycode.l -@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface - extern "C" { // some bogus code to keep the compiler happy - void pycodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." - #endif - ---- src/vhdlcode.l -+++ src.a/vhdlcode.l -@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner() - extern "C" { // some bogus code to keep the compiler happy - void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } - } --#elif YY_FLEX_SUBMINOR_VERSION<33 -+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 - #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!" - #endif - |