===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/Attic/initscan.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/lex/Attic/initscan.c	2015/11/19 23:20:34	1.16
--- src/usr.bin/lex/Attic/initscan.c	2015/11/19 23:34:56	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: initscan.c,v 1.16 2015/11/19 23:20:34 tedu Exp $	*/
  
  #line 3 "scan.c"
  
--- 1,4 ----
! /*	$OpenBSD: initscan.c,v 1.17 2015/11/19 23:34:56 mmcc Exp $	*/
  
  #line 3 "scan.c"
  
***************
*** 2233,2239 ****
  
  	int doing_codeblock = false;
  	int i, brace_depth=0, brace_start_line=0;
! 	Char nmdef[MAXLINE];
  
  
  #line 2239 "scan.c"
--- 2233,2239 ----
  
  	int doing_codeblock = false;
  	int i, brace_depth=0, brace_start_line=0;
! 	u_char nmdef[MAXLINE];
  
  
  #line 2239 "scan.c"
***************
*** 3382,3388 ****
                     * The reason it was disabled is so yacc/bison can parse
                     * ccl operations, such as ccl difference and union.
                     */
!                 &&  (cclval = ccllookup( (Char *) nmstr )) != 0 )
  				{
  				if ( input() != ']' )
  					synerr( _( "bad character class" ) );
--- 3382,3388 ----
                     * The reason it was disabled is so yacc/bison can parse
                     * ccl operations, such as ccl difference and union.
                     */
!                 &&  (cclval = ccllookup( (u_char *) nmstr )) != 0 )
  				{
  				if ( input() != ']' )
  					synerr( _( "bad character class" ) );
***************
*** 3396,3402 ****
  				/* We fudge a bit.  We know that this ccl will
  				 * soon be numbered as lastccl + 1 by cclinit.
  				 */
! 				cclinstal( (Char *) nmstr, lastccl + 1 );
  
  				/* Push back everything but the leading bracket
  				 * so the ccl can be rescanned.
--- 3396,3402 ----
  				/* We fudge a bit.  We know that this ccl will
  				 * soon be numbered as lastccl + 1 by cclinit.
  				 */
! 				cclinstal( (u_char *) nmstr, lastccl + 1 );
  
  				/* Push back everything but the leading bracket
  				 * so the ccl can be rescanned.
***************
*** 3427,3433 ****
  YY_RULE_SETUP
  #line 663 "scan.l"
  {
! 			Char *nmdefptr;
              int end_is_ws, end_ch;
  
              end_ch = yytext[yyleng-1];
--- 3427,3433 ----
  YY_RULE_SETUP
  #line 663 "scan.l"
  {
! 			u_char *nmdefptr;
              int end_is_ws, end_ch;
  
              end_ch = yytext[yyleng-1];
***************
*** 4066,4072 ****
  YY_RULE_SETUP
  #line 949 "scan.l"
  {
! 			yylval = myesc( (Char *) yytext );
  
  			if ( YY_START == FIRSTCCL )
  				BEGIN(CCL);
--- 4066,4072 ----
  YY_RULE_SETUP
  #line 949 "scan.l"
  {
! 			yylval = myesc( (u_char *) yytext );
  
  			if ( YY_START == FIRSTCCL )
  				BEGIN(CCL);