Author: uqs
Date: Sun Oct 24 15:31:41 2010
New Revision: 214272
URL: http://svn.freebsd.org/changeset/base/214272
Log:
flex: add missing ifdef magic to create/hide prototypes
This unbreaks build for some software with higher WARNS flags.
Reviewed by: rpaulo
PR: bin/139319 (parts already committed in previous revision)
Modified:
head/usr.bin/lex/flex.skl
Modified: head/usr.bin/lex/flex.skl
==============================================================================
--- head/usr.bin/lex/flex.skl Sun Oct 24 13:48:11 2010 (r214271)
+++ head/usr.bin/lex/flex.skl Sun Oct 24 15:31:41 2010 (r214272)
@@ -747,7 +747,11 @@ void yyFlexLexer::LexerOutput( const cha
*/
%-
+#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()
%*
@@ -883,7 +887,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()
%*
@@ -983,7 +991,11 @@ void yyFlexLexer::yyunput( int c, char*
#ifdef __cplusplus
static int yyinput()
#else
+#ifdef YY_USE_PROTOS
static int input(void)
+#else
+static int input()
+#endif
#endif
%+
int yyFlexLexer::yyinput()
@@ -1055,7 +1067,9 @@ int yyFlexLexer::yyinput()
return c;
}
-#endif /* ifndef YY_NO_INPUT */
+%-
+#endif /* ifndef YY_NO_INPUT */
+%*
%-
@@ -1404,7 +1418,11 @@ void yyFlexLexer::yy_push_state( int new
#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()
%*
@@ -1419,7 +1437,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()
%*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
