From eb49bd3df0f20cf99825002387c2dbceefe9b784 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 17 Aug 2010 02:13:31 -0400 Subject: [PATCH] Windows: Fix remove 'register' patch The register removal patch broke the Windows build. Fix it. Change-Id: I0121da17a98e1eb35932d18c851989737d9325b5 Reviewed-on: http://gerrit.openafs.org/2571 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/comerr/error_table_nt.c | 2 +- src/comerr/et_lex.lex_nt.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/comerr/error_table_nt.c b/src/comerr/error_table_nt.c index 8273011086..b1ee9cdfe2 100755 --- a/src/comerr/error_table_nt.c +++ b/src/comerr/error_table_nt.c @@ -409,7 +409,7 @@ yyparse(YYPARSE_PARAM) int yystate; int yyn; short *yyssp; - int YYSTYPE *yyvsp; + YYSTYPE *yyvsp; int yyerrstatus; /* number of tokens to shift before error messages enabled */ int yychar1 = 0; /* lookahead token as an internal (translated) token number */ diff --git a/src/comerr/et_lex.lex_nt.c b/src/comerr/et_lex.lex_nt.c index 50689827a7..91ddcae012 100644 --- a/src/comerr/et_lex.lex_nt.c +++ b/src/comerr/et_lex.lex_nt.c @@ -542,7 +542,7 @@ YY_MALLOC_DECL YY_DECL { - int yy_state_type yy_current_state; + yy_state_type yy_current_state; char *yy_cp, *yy_bp; int yy_act; @@ -598,7 +598,7 @@ YY_DECL yy_match: do { - int YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -974,7 +974,7 @@ static int yy_get_next_buffer() static yy_state_type yy_get_previous_state() { - int yy_state_type yy_current_state; + yy_state_type yy_current_state; char *yy_cp; yy_current_state = yy_start; @@ -983,7 +983,7 @@ static yy_state_type yy_get_previous_state() for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) { - int YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -1013,7 +1013,7 @@ yy_state_type yy_current_state; { int yy_is_jam; - int YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state];