From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 17 Aug 2010 06:13:31 +0000 (-0400)
Subject: Windows: Fix remove 'register' patch
X-Git-Tag: openafs-devel-1_5_77~46
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ccd13703d771e4e2a4df0483d9e5120663a1d1db;p=packages%2Fo%2Fopenafs.git

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 <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit eb49bd3df0f20cf99825002387c2dbceefe9b784)
Reviewed-on: http://gerrit.openafs.org/2587
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/comerr/error_table_nt.c b/src/comerr/error_table_nt.c
index 827301108..b1ee9cdfe 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 50689827a..91ddcae01 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];