From 9318e335c809a832078e8efad4054cbb456ad1da Mon Sep 17 00:00:00 2001 From: Theophile Ranquet Date: Fri, 7 Dec 2012 12:13:38 +0100 Subject: [PATCH] cpp: simplify the Flex version checking macro * src/flex-scanner,h (FLEX_VERSION): Consider YY_FLEX_SUBMINOR_VERSION defined. --- src/flex-scanner.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/flex-scanner.h b/src/flex-scanner.h index dbb01db..c854c29 100644 --- a/src/flex-scanner.h +++ b/src/flex-scanner.h @@ -22,16 +22,10 @@ #endif /* Flex full version as a number. */ -#ifdef YY_FLEX_SUBMINOR_VERSION -# define FLEX_VERSION \ +#define FLEX_VERSION \ ((YY_FLEX_MAJOR_VERSION) * 1000000 \ + (YY_FLEX_MINOR_VERSION) * 1000 \ + (YY_FLEX_SUBMINOR_VERSION)) -#else -# define FLEX_VERSION \ - ((YY_FLEX_MAJOR_VERSION) * 1000000 \ - + (YY_FLEX_MINOR_VERSION) * 1000) -#endif /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used. */ # if FLEX_VERSION <= 2005031 -- 2.7.4