From owner-svn-src-all@FreeBSD.ORG Wed Oct 13 10:31:32 2010 Return-Path: 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 B762D106566C; Wed, 13 Oct 2010 10:31:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A59768FC08; Wed, 13 Oct 2010 10:31:32 +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 o9DAVWhp080443; Wed, 13 Oct 2010 10:31:32 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DAVWoQ080441; Wed, 13 Oct 2010 10:31:32 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201010131031.o9DAVWoQ080441@svn.freebsd.org> From: Rui Paulo Date: Wed, 13 Oct 2010 10:31:32 +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: r213764 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 10:31:32 -0000 Author: rpaulo Date: Wed Oct 13 10:31:32 2010 New Revision: 213764 URL: http://svn.freebsd.org/changeset/base/213764 Log: Don't define the input() function ifdef YY_NO_INPUT. This was previously done for the input() function. Submitted by: Norberto Lopes Modified: head/usr.bin/lex/flex.skl Modified: head/usr.bin/lex/flex.skl ============================================================================== --- head/usr.bin/lex/flex.skl Wed Oct 13 09:33:26 2010 (r213763) +++ head/usr.bin/lex/flex.skl Wed Oct 13 10:31:32 2010 (r213764) @@ -979,6 +979,7 @@ void yyFlexLexer::yyunput( int c, char* %- +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -1054,6 +1055,7 @@ int yyFlexLexer::yyinput() return c; } +#endif /* ifndef YY_NO_INPUT */ %-