From: Theophile Ranquet <ranquet@lrde.epita.fr>
Date: Fri, 7 Dec 2012 11:13:38 +0000 (+0100)
Subject: cpp: simplify the Flex version checking macro
X-Git-Tag: v2.6.90~2
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/9318e335c809a832078e8efad4054cbb456ad1da

cpp: simplify the Flex version checking macro

* src/flex-scanner,h (FLEX_VERSION): Consider YY_FLEX_SUBMINOR_VERSION
defined.
---

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index dbb01dbd..c854c29a 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