svn commit: r250878 - head/contrib/flex

[Jung-uk Kim]

Author: jkim
Date: Tue May 21 19:22:42 2013
New Revision: 250878
URL: http://svnweb.freebsd.org/changeset/base/250878

Log:
  Allow YY_NO_UNPUT to disable unput() for backward compatibility.

Modified:
  head/contrib/flex/flex.skl

Modified: head/contrib/flex/flex.skl
==============================================================================
--- head/contrib/flex/flex.skl	Tue May 21 19:21:26 2013	(r250877)
+++ head/contrib/flex/flex.skl	Tue May 21 19:22:42 2013	(r250878)
@@ -1032,7 +1032,9 @@ extern int yywrap M4_YY_PARAMS( M4_YY_PR
 %not-for-header
     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,9 +1810,11 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
 %if-c-only
 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
 {
@@ -1857,6 +1861,7 @@ 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