summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortsi <tsi@openbsd.org>2007-01-16 14:43:28 +0000
committertsi <tsi@openbsd.org>2007-01-16 14:43:28 +0000
commit8c538b9ab9a8953bc5fdb2c22ccc4270a5d15b66 (patch)
tree7b25e5f7724dfe94f42664cb17d49b44210e1470
parentRemove unnecessary ampersands in ADR2CELL macro invocations; (diff)
downloadwireguard-openbsd-8c538b9ab9a8953bc5fdb2c22ccc4270a5d15b66.tar.xz
wireguard-openbsd-8c538b9ab9a8953bc5fdb2c22ccc4270a5d15b66.zip
Eliminate gcc -Wundef warnings in flex-generated code.
ok miod@
-rw-r--r--usr.bin/lex/flex.skl12
-rw-r--r--usr.bin/lex/initscan.c14
2 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 0fa5d9c6f2c..31b0a04cae4 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,9 +1,9 @@
-/* $OpenBSD: flex.skl,v 1.8 2004/02/09 11:38:31 espie Exp $ */
+/* $OpenBSD: flex.skl,v 1.9 2007/01/16 14:43:28 tsi Exp $ */
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /home/cvs/src/usr.bin/lex/flex.skl,v 1.8 2004/02/09 11:38:31 espie Exp $
+ * $Header: /home/cvs/src/usr.bin/lex/flex.skl,v 1.9 2007/01/16 14:43:28 tsi Exp $
*/
#define FLEX_SCANNER
@@ -339,7 +339,7 @@ static int input YY_PROTO(( void ));
%*
#endif
-#if YY_STACK_USED
+#ifdef 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 @@ void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )
b->yy_fill_buffer = 1;
%-
-#if YY_ALWAYS_INTERACTIVE
+#ifdef YY_ALWAYS_INTERACTIVE
b->yy_is_interactive = 1;
#else
-#if YY_NEVER_INTERACTIVE
+#ifdef YY_NEVER_INTERACTIVE
b->yy_is_interactive = 0;
#else
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
@@ -1540,7 +1540,7 @@ void *ptr;
free( ptr );
}
-#if YY_MAIN
+#ifdef YY_MAIN
int main()
{
yylex();
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index bf6749210cb..326edb32df8 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: initscan.c,v 1.11 2006/12/06 05:03:29 ray Exp $ */
+/* $OpenBSD: initscan.c,v 1.12 2007/01/16 14:43:28 tsi Exp $ */
#line 2 "scan.c"
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.11 2006/12/06 05:03:29 ray Exp $
+ * $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.12 2007/01/16 14:43:28 tsi Exp $
*/
#define FLEX_SCANNER
@@ -1277,7 +1277,7 @@ char *yytext;
* PURPOSE.
*/
-/* $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.11 2006/12/06 05:03:29 ray Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/Attic/initscan.c,v 1.12 2007/01/16 14:43:28 tsi Exp $ */
#include "flexdef.h"
#include "parse.h"
@@ -1370,7 +1370,7 @@ static int input YY_PROTO(( void ));
#endif
#endif
-#if YY_STACK_USED
+#ifdef YY_STACK_USED
static int yy_start_stack_ptr = 0;
static int yy_start_stack_depth = 0;
static int *yy_start_stack = 0;
@@ -3340,10 +3340,10 @@ FILE *file;
b->yy_input_file = file;
b->yy_fill_buffer = 1;
-#if YY_ALWAYS_INTERACTIVE
+#ifdef YY_ALWAYS_INTERACTIVE
b->yy_is_interactive = 1;
#else
-#if YY_NEVER_INTERACTIVE
+#ifdef YY_NEVER_INTERACTIVE
b->yy_is_interactive = 0;
#else
b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
@@ -3634,7 +3634,7 @@ void *ptr;
free( ptr );
}
-#if YY_MAIN
+#ifdef YY_MAIN
int main()
{
yylex();