Since we're depending on %option noyywrap in the main scanner now,

we may as well use it in all our flex files.  Make all the flex files
have a consistent set of options.

1 files changed, 6 insertions, 2 deletions

diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
index e10e7faad8..d1aed4c75a 100644
--- a/contrib/cube/cubescan.l
+++ b/contrib/cube/cubescan.l
@@ -10,8 +10,6 @@
 #include "cubeparse.h"
 #include "buffer.h"
 
-#define YY_NO_UNPUT 1
-#undef  yywrap
 
 /* flex screws a couple symbols when used with the -P otion; fix those */
 #define YY_DECL int cube_yylex YY_PROTO(( void )); \
@@ -28,6 +26,12 @@ int cube_yylex YY_PROTO(( void ))
 void cube_flush_scanner_buffer(void); 
 %}
 
+%option 8bit
+%option never-interactive
+%option nounput
+%option noyywrap
+
+
 n            [0-9]+
 integer      [+-]?{n}
 real         [+-]?({n}\.{n}?)|(\.{n})