X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6c05543cb03b40b9728f7073c4073ce993d796c6..ea9e670d728ac659e139434de31ea9306ecdd117:/src/flex-scanner.h diff --git a/src/flex-scanner.h b/src/flex-scanner.h index c1e07eae..40253512 100644 --- a/src/flex-scanner.h +++ b/src/flex-scanner.h @@ -21,20 +21,14 @@ # error "FLEX_PREFIX not defined" #endif -/* Whether this version of Flex is (strictly) greater than - Major.Minor.Subminor. */ -#define FLEX_VERSION_GT(Major, Minor, Subminor) \ - (defined YY_FLEX_MAJOR_VERSION \ - && (Major < YY_FLEX_MAJOR_VERSION \ - || (Major == YY_FLEX_MAJOR_VERSION \ - && (defined YY_FLEX_MINOR_VERSION \ - && (Minor < YY_FLEX_MINOR_VERSION \ - || (Minor == YY_FLEX_MINOR_VERSION \ - && defined YY_FLEX_SUBMINOR_VERSION \ - && Subminor < YY_FLEX_SUBMINOR_VERSION)))))) +/* Flex full version as a number. */ +#define FLEX_VERSION \ + ((YY_FLEX_MAJOR_VERSION) * 1000000 \ + + (YY_FLEX_MINOR_VERSION) * 1000 \ + + (YY_FLEX_SUBMINOR_VERSION)) /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */ -#if ! FLEX_VERSION_GT (2, 5, 31) +# if FLEX_VERSION <= 2005031 int FLEX_PREFIX (get_lineno) (void); FILE *FLEX_PREFIX (get_in) (void); FILE *FLEX_PREFIX (get_out) (void); @@ -65,7 +59,7 @@ int FLEX_PREFIX (lex_destroy) (void); versions according to the Flex manual) leak memory if yylex_destroy is not invoked. However, yylex_destroy is not defined before Flex 2.5.9, so give an implementation here that at least appears to work with Flex 2.5.4. */ -#if ! FLEX_VERSION_GT (2, 5, 9) +#if FLEX_VERSION <= 2005009 # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER) #endif