Merge remote-tracking branch 'origin/maint'

[bison.git] / src / flex-scanner.h

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index 9b80744de6df88cdd886a67f574fbb5731c809bb..d72986e8126664d0b4efde3fa836294cd4cc8d45 100644 (file)
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,6 +1,6 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 

-   Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -21,20 +21,14 @@
 # error "FLEX_PREFIX not defined"
 #endif
 
 # error "FLEX_PREFIX not defined"
 #endif
 

-/* Whether this version of Flex is (strictly) greater than
-   Major.Minor.Subminor.  */
-#ifdef YY_FLEX_SUBMINOR_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
+/* 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.  */
 /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used.  */

-# if FLEX_VERSION <= 2005031
+#if FLEX_VERSION <= 2005031

 int   FLEX_PREFIX (get_lineno) (void);
 FILE *FLEX_PREFIX (get_in) (void);
 FILE *FLEX_PREFIX (get_out) (void);
 int   FLEX_PREFIX (get_lineno) (void);
 FILE *FLEX_PREFIX (get_in) (void);
 FILE *FLEX_PREFIX (get_out) (void);