===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/lex/flex.skl	2007/01/16 14:43:28	1.9
+++ src/usr.bin/lex/flex.skl	2007/01/26 14:38:19	1.10
@@ -1,9 +1,9 @@
-/*	$OpenBSD: flex.skl,v 1.9 2007/01/16 14:43:28 tsi Exp $	*/
+/*	$OpenBSD: flex.skl,v 1.10 2007/01/26 14:38:19 tsi Exp $	*/
 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.9 2007/01/16 14:43:28 tsi Exp $
+ * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.10 2007/01/26 14:38:19 tsi Exp $
  */
 
 #define FLEX_SCANNER
@@ -339,7 +339,7 @@
 %*
 #endif
 
-#ifdef YY_STACK_USED
+#if defined(YY_STACK_USED) && YY_STACK_USED
 static int yy_start_stack_ptr = 0;
 static int yy_start_stack_depth = 0;
 static int *yy_start_stack = 0;
@@ -1210,10 +1210,10 @@
 	b->yy_fill_buffer = 1;
 
 %-
-#ifdef YY_ALWAYS_INTERACTIVE
+#if defined(YY_ALWAYS_INTERACTIVE) && YY_ALWAYS_INTERACTIVE
 	b->yy_is_interactive = 1;
 #else
-#ifdef YY_NEVER_INTERACTIVE
+#if defined(YY_NEVER_INTERACTIVE) && YY_NEVER_INTERACTIVE
 	b->yy_is_interactive = 0;
 #else
 	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
@@ -1540,7 +1540,7 @@
 	free( ptr );
 	}
 
-#ifdef YY_MAIN
+#if defined(YY_MAIN) && YY_MAIN
 int main()
 	{
 	yylex();