===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/lex/flex.skl	2017/05/02 19:16:19	1.16
--- src/usr.bin/lex/flex.skl	2020/08/06 17:23:29	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: flex.skl,v 1.16 2017/05/02 19:16:19 millert Exp $	*/
  
  %# -*-C-*- vi: set ft=c:
  %# This file is processed in several stages.
--- 1,4 ----
! /*	$OpenBSD: flex.skl,v 1.17 2020/08/06 17:23:29 deraadt Exp $	*/
  
  %# -*-C-*- vi: set ft=c:
  %# This file is processed in several stages.
***************
*** 1308,1337 ****
  m4_ifdef( [[M4_YY_USES_REJECT]],
  [[
          /* Create the reject buffer large enough to save one state per allowed character. */
!         if ( ! YY_G(yy_state_buf) )
!             YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  M4_YY_CALL_LAST_ARG);
!             if ( ! YY_G(yy_state_buf) )
!                 YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
  ]])
  
  		if ( ! YY_G(yy_start) )
  			YY_G(yy_start) = 1;	/* first start state */
  
! 		if ( ! yyin )
  %if-c-only
  			yyin = stdin;
  %endif
  %if-c++-only
  			yyin = & std::cin;
  %endif
  
! 		if ( ! yyout )
  %if-c-only
  			yyout = stdout;
  %endif
  %if-c++-only
  			yyout = & std::cout;
  %endif
  
  		if ( ! YY_CURRENT_BUFFER ) {
  			yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG);
--- 1308,1340 ----
  m4_ifdef( [[M4_YY_USES_REJECT]],
  [[
          /* Create the reject buffer large enough to save one state per allowed character. */
! 		if ( ! YY_G(yy_state_buf) )
! 			YY_G(yy_state_buf) = (yy_state_type *)
! 				yyalloc(YY_STATE_BUF_SIZE  M4_YY_CALL_LAST_ARG);
! 	        if ( ! YY_G(yy_state_buf) )
! 	                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
  ]])
  
  		if ( ! YY_G(yy_start) )
  			YY_G(yy_start) = 1;	/* first start state */
  
! 		if ( ! yyin ) {
  %if-c-only
  			yyin = stdin;
  %endif
  %if-c++-only
  			yyin = & std::cin;
  %endif
+ 		}
  
! 		if ( ! yyout ) {
  %if-c-only
  			yyout = stdout;
  %endif
  %if-c++-only
  			yyout = & std::cout;
  %endif
+ 		}
  
  		if ( ! YY_CURRENT_BUFFER ) {
  			yyensure_buffer_stack (M4_YY_CALL_ONLY_ARG);
***************
*** 1340,1346 ****
  		}
  
  		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
! 		}
  
  	{
  %% [7.0] user's declarations go here
--- 1343,1349 ----
  		}
  
  		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
! 	}
  
  	{
  %% [7.0] user's declarations go here