svn commit: r250642 - projects/flex-sf/contrib/flex

[Jung-uk Kim]

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