Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-22 02:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpp: make the check of Flex version portable

Browse Source 
This was problematic with tcc 0.9.25

* src/flex-scanner.h (FLEX_VERSION_GT): Rewrite and rename as...
(FLEX_VERSION): This.
This commit is contained in:
Theophile Ranquet
2012-12-05 18:26:36 +01:00
parent e35cd6def7
commit b56484a5d3
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/flex-scanner.h
View File

@@ -23,18 +23,18 @@
/* Whether this version of Flex is (strictly) greater than /* Whether this version of Flex is (strictly) greater than
Major.Minor.Subminor. */ Major.Minor.Subminor. */
#define FLEX_VERSION_GT(Major, Minor, Subminor) \ #ifdef YY_FLEX_SUBMINOR_VERSION
(defined YY_FLEX_MAJOR_VERSION \ # define FLEX_VERSION \
&& (Major < YY_FLEX_MAJOR_VERSION \ (YY_FLEX_MAJOR_VERSION) * 1000000 \
|| (Major == YY_FLEX_MAJOR_VERSION \ + (YY_FLEX_MINOR_VERSION) * 1000 \
&& (defined YY_FLEX_MINOR_VERSION \ + (YY_FLEX_SUBMINOR_VERSION)
&& (Minor < YY_FLEX_MINOR_VERSION \ #else
|| (Minor == YY_FLEX_MINOR_VERSION \ # define FLEX_VERSION \
&& defined YY_FLEX_SUBMINOR_VERSION \ (YY_FLEX_MAJOR_VERSION) * 1000000 \
&& Subminor < YY_FLEX_SUBMINOR_VERSION)))))) + (YY_FLEX_MINOR_VERSION) * 1000
#endif
/* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */ /* 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); int FLEX_PREFIX (get_lineno) (void);
FILE *FLEX_PREFIX (get_in) (void); FILE *FLEX_PREFIX (get_in) (void);
FILE *FLEX_PREFIX (get_out) (void); FILE *FLEX_PREFIX (get_out) (void);
@@ -65,7 +65,7 @@ int FLEX_PREFIX (lex_destroy) (void);
versions according to the Flex manual) leak memory if yylex_destroy is not 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 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. */ 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) # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER)
#endif #endif