Control: tags -1 patch Hi Maintainer
Please see attached patch which fixes the FTBFS with recent versions of flex. Regards Graham
Description: Fix FTBFS with recent versions of flex Bug-Debian: https://bugs.debian.org/818072 Forwarded: No Author: Graham Inggs <gin...@debian.org> Last-Update: 2016-05-01 --- a/lib/framework/resource_lexer.lpp +++ b/lib/framework/resource_lexer.lpp @@ -49,7 +49,7 @@ * yyget_text() and yyget_lineno(). * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) # define yyget_extra res_get_extra # define yyset_extra res_set_extra # define yyget_lineno res_get_lineno @@ -67,7 +67,7 @@ { return yytext; } -#elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#elif defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern YY_EXTRA_TYPE yyget_extra(void); extern int res_get_lineno(void); extern FILE *res_get_in(void); @@ -149,7 +149,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int res_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/lib/framework/strres_lexer.lpp +++ b/lib/framework/strres_lexer.lpp @@ -53,7 +53,7 @@ * yyget_text() and yyget_lineno(). * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) # define yyget_extra strres_get_extra # define yyset_extra strres_set_extra # define yyget_lineno strres_get_lineno @@ -71,7 +71,7 @@ { return yytext; } -#elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#elif defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern YY_EXTRA_TYPE yyget_extra(void); extern int strres_get_lineno(void); extern FILE *strres_get_in(void); @@ -146,7 +146,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int strres_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/lib/script/chat_lexer.lpp +++ b/lib/script/chat_lexer.lpp @@ -47,7 +47,7 @@ #define YYLMAX 255 #endif -#if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#if defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern int chat_get_lineno(void); extern FILE *chat_get_in(void); extern FILE *chat_get_out(void); @@ -227,7 +227,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int chat_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/lib/script/script_lexer.lpp +++ b/lib/script/script_lexer.lpp @@ -45,7 +45,7 @@ #define YYLMAX 255 #endif -#if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#if defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern int scr_get_lineno(void); extern FILE *scr_get_in(void); extern FILE *scr_get_out(void); @@ -857,7 +857,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int scr_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/lib/gamelib/audp_lexer.lpp +++ b/lib/gamelib/audp_lexer.lpp @@ -52,7 +52,7 @@ * yyget_text() and yyget_lineno(). * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) # define yyget_extra audp_get_extra # define yyset_extra audp_set_extra # define yyget_lineno audp_get_lineno @@ -70,7 +70,7 @@ { return yytext; } -#elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#elif defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern YY_EXTRA_TYPE yyget_extra(void); extern int audp_get_lineno(void); extern FILE *audp_get_in(void); @@ -169,7 +169,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int audp_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/src/level_lexer.lpp +++ b/src/level_lexer.lpp @@ -51,7 +51,7 @@ * yyget_text() and yyget_lineno(). * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) # define yyget_extra lev_get_extra # define yyset_extra lev_set_extra # define yyget_lineno lev_get_lineno @@ -69,7 +69,7 @@ { return yytext; } -#elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#elif defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern YY_EXTRA_TYPE yyget_extra(void); extern int lev_get_lineno(void); extern FILE *lev_get_in(void); @@ -168,7 +168,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int lev_lex_destroy(void) { /* For non-reentrant C scanner only. */ --- a/src/scriptvals_lexer.lpp +++ b/src/scriptvals_lexer.lpp @@ -59,7 +59,7 @@ * yyget_text() and yyget_lineno(). * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) # define yyget_extra scrv_get_extra # define yyset_extra scrv_set_extra # define yyget_lineno scrv_get_lineno @@ -77,7 +77,7 @@ { return yytext; } -#elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33 +#elif defined(YY_FLEX_SUBMINOR_VERSION) && ((YY_FLEX_MAJOR_VERSION > 2) || (YY_FLEX_SUBMAJOR_VERSION > 5) || (YY_FLEX_SUBMINOR_VERSION >= 33)) extern YY_EXTRA_TYPE yyget_extra(void); extern int scrv_get_lineno(void); extern FILE *scrv_get_in(void); @@ -198,7 +198,7 @@ /* Older GNU Flex versions don't define yylex_destroy() * (and neither define a subminor version) */ -#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9) +#if !defined(YY_FLEX_SUBMINOR_VERSION) || ((YY_FLEX_SUBMAJOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 9)) int scrv_lex_destroy(void) { /* For non-reentrant C scanner only. */
