From owner-svn-src-all@FreeBSD.ORG  Sun Oct 24 15:31:42 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD558106566C;
	Sun, 24 Oct 2010 15:31:41 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B15F58FC15;
	Sun, 24 Oct 2010 15:31:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9OFVffd032195;
	Sun, 24 Oct 2010 15:31:41 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9OFVfCL032193;
	Sun, 24 Oct 2010 15:31:41 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201010241531.o9OFVfCL032193@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Sun, 24 Oct 2010 15:31:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214272 - head/usr.bin/lex
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Oct 2010 15:31:42 -0000

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()
 %*