From owner-svn-src-projects@FreeBSD.ORG  Tue May 14 21:37:52 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DBFE5B3C;
 Tue, 14 May 2013 21:37:52 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CDA6EF45;
 Tue, 14 May 2013 21:37:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4ELbqsL007321;
 Tue, 14 May 2013 21:37:52 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4ELbqH8007320;
 Tue, 14 May 2013 21:37:52 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305142137.r4ELbqH8007320@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 14 May 2013 21:37:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250642 - projects/flex-sf/contrib/flex
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 May 2013 21:37:52 -0000

Author: jkim
Date: Tue May 14 21:37:52 2013
New Revision: 250642
URL: http://svnweb.freebsd.org/changeset/base/250642

Log:
  Refine r250472.  This removes empty #ifdef/#endif pairs when nounput is set.

Modified:
  projects/flex-sf/contrib/flex/flex.skl

Modified: projects/flex-sf/contrib/flex/flex.skl
==============================================================================
--- projects/flex-sf/contrib/flex/flex.skl	Tue May 14 21:27:50 2013	(r250641)
+++ projects/flex-sf/contrib/flex/flex.skl	Tue May 14 21:37:52 2013	(r250642)
@@ -1030,12 +1030,12 @@ extern int yywrap M4_YY_PARAMS( M4_YY_PR
 #endif
 
 %not-for-header
-#ifndef YY_NO_UNPUT
     m4_ifdef( [[M4_YY_NO_UNPUT]],,
     [[
+#ifndef YY_NO_UNPUT
     static void yyunput M4_YY_PARAMS( int c, char *buf_ptr  M4_YY_PROTO_LAST_ARG);
-    ]])
 #endif
+    ]])
 %ok-for-header
 %endif
 
@@ -1808,12 +1808,13 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
 
 
 %if-c-only
-#ifndef YY_NO_UNPUT
 m4_ifdef( [[M4_YY_NO_UNPUT]],,
 [[
+#ifndef YY_NO_UNPUT
     static void yyunput YYFARGS2( int,c, char *,yy_bp)
 %endif
 %if-c++-only
+#ifndef YY_NO_UNPUT
     void yyFlexLexer::yyunput( int c, char* yy_bp)
 %endif
 {
@@ -1860,9 +1861,9 @@ m4_ifdef( [[M4_YY_USE_LINENO]],
 	YY_G(yy_hold_char) = *yy_cp;
 	YY_G(yy_c_buf_p) = yy_cp;
 }
+#endif	/* ifndef YY_NO_UNPUT */
 %if-c-only
 ]])
-#endif	/* ifndef YY_NO_UNPUT */
 %endif
 
 %if-c-only