From bf6da0f481b4923edbf56aa82ce68ebc3bf31e10 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 21 Jun 2008 19:32:14 +0000 Subject: [PATCH] Fix -Wold-style-definition warnings in the scanner skeleton. --- usr.bin/lex/flex.skl | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl index fdce114f99..9eaff001f1 100644 --- a/usr.bin/lex/flex.skl +++ b/usr.bin/lex/flex.skl @@ -3,7 +3,7 @@ /* Scanner skeleton version: * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $ - * $DragonFly: src/usr.bin/lex/flex.skl,v 1.7 2008/05/01 20:01:24 swildner Exp $ + * $DragonFly: src/usr.bin/lex/flex.skl,v 1.8 2008/06/21 19:32:14 swildner Exp $ */ #define FLEX_SCANNER @@ -738,7 +738,11 @@ void yyFlexLexer::LexerOutput( const char* buf, int size ) */ %- +#ifdef YY_USE_PROTOS +static int yy_get_next_buffer( void ) +#else static int yy_get_next_buffer() +#endif %+ int yyFlexLexer::yy_get_next_buffer() %* @@ -874,7 +878,11 @@ int yyFlexLexer::yy_get_next_buffer() /* yy_get_previous_state - get the state just before the EOB char was reached */ %- +#ifdef YY_USE_PROTOS +static yy_state_type yy_get_previous_state( void ) +#else static yy_state_type yy_get_previous_state() +#endif %+ yy_state_type yyFlexLexer::yy_get_previous_state() %* @@ -973,8 +981,12 @@ void yyFlexLexer::yyunput( int c, register char* yy_bp ) #ifdef __cplusplus static int yyinput() #else +#ifdef YY_USE_PROTOS +static int input( void ) +#else static int input() #endif +#endif %+ int yyFlexLexer::yyinput() %* @@ -1387,7 +1399,11 @@ void yyFlexLexer::yy_push_state( int new_state ) #ifndef YY_NO_POP_STATE %- +#ifdef YY_USE_PROTOS +static void yy_pop_state( void ) +#else static void yy_pop_state() +#endif %+ void yyFlexLexer::yy_pop_state() %* @@ -1402,7 +1418,11 @@ void yyFlexLexer::yy_pop_state() #ifndef YY_NO_TOP_STATE %- +#ifdef YY_USE_PROTOS +static int yy_top_state( void ) +#else static int yy_top_state() +#endif %+ int yyFlexLexer::yy_top_state() %* -- 2.11.4.GIT