Merge branch release-2016

[alexxy/gromacs.git] / src / gromacs / selection / scanner_flex.h

diff --git a/src/gromacs/selection/scanner_flex.h b/src/gromacs/selection/scanner_flex.h
index abad91858e7dc5f935ff2528ff63dd32b2487038..14d3030508e30446a5df94834a9bda7f9531da50 100644 (file)
--- a/src/gromacs/selection/scanner_flex.h
+++ b/src/gromacs/selection/scanner_flex.h
@@ -23,8 +23,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -143,7 +143,15 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -223,7 +231,7 @@ void *_gmx_sel_yyalloc (yy_size_t ,yyscan_t yyscanner );
 void *_gmx_sel_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
 void _gmx_sel_yyfree (void * ,yyscan_t yyscanner );
 
-#define _gmx_sel_yywrap(yyscanner) 1
+#define _gmx_sel_yywrap(yyscanner) (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -267,11 +275,11 @@ void _gmx_sel_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
 
 FILE *_gmx_sel_yyget_in (yyscan_t yyscanner );
 
-void _gmx_sel_yyset_in  (FILE * in_str ,yyscan_t yyscanner );
+void _gmx_sel_yyset_in  (FILE * _in_str ,yyscan_t yyscanner );
 
 FILE *_gmx_sel_yyget_out (yyscan_t yyscanner );
 
-void _gmx_sel_yyset_out  (FILE * out_str ,yyscan_t yyscanner );
+void _gmx_sel_yyset_out  (FILE * _out_str ,yyscan_t yyscanner );
 
 yy_size_t _gmx_sel_yyget_leng (yyscan_t yyscanner );
 
@@ -279,11 +287,11 @@ char *_gmx_sel_yyget_text (yyscan_t yyscanner );
 
 int _gmx_sel_yyget_lineno (yyscan_t yyscanner );
 
-void _gmx_sel_yyset_lineno (int line_number ,yyscan_t yyscanner );
+void _gmx_sel_yyset_lineno (int _line_number ,yyscan_t yyscanner );
 
 int _gmx_sel_yyget_column  (yyscan_t yyscanner );
 
-void _gmx_sel_yyset_column (int column_no ,yyscan_t yyscanner );
+void _gmx_sel_yyset_column (int _column_no ,yyscan_t yyscanner );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -311,7 +319,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Number of entries by which start-condition stack grows. */
@@ -344,8 +357,8 @@ extern int _gmx_sel_yylex (yyscan_t yyscanner);
 #undef YY_DECL
 #endif
 
-#line 172 "scanner.l"
+#line 178 "scanner.l"
 
-#line 350 "scanner_flex.h"
+#line 363 "scanner_flex.h"
 #undef _gmx_sel_yyIN_HEADER
 #endif /* _gmx_sel_yyHEADER_H */