From 1eb1cb6f6208850c979307615f4b1e032803b0a6 Mon Sep 17 00:00:00 2001
From: dtrg <none@none>
Date: Tue, 18 Jul 2006 17:00:30 +0000
Subject: [PATCH] Renamed the 'index' variable to 'offset', to prevent clashes
 with the libc index() function.

---
 mach/z8000/as/mach1.c |  2 +-
 mach/z8000/as/mach4.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mach/z8000/as/mach1.c b/mach/z8000/as/mach1.c
index 67dded7ff..0e48130e1 100644
--- a/mach/z8000/as/mach1.c
+++ b/mach/z8000/as/mach1.c
@@ -63,7 +63,7 @@ struct address
 };
 
 extern expr_t	displ;	/* never more than 16 bits */
-extern short	index;	/* never more than 16 bits */
+extern short	offset;	/* never more than 16 bits */
 extern short	mode;
 #ifndef extern
 extern short	modetbl[ 5 ];
diff --git a/mach/z8000/as/mach4.c b/mach/z8000/as/mach4.c
index b8645a3d8..fd01c1ac5 100644
--- a/mach/z8000/as/mach4.c
+++ b/mach/z8000/as/mach4.c
@@ -131,7 +131,7 @@ f2	: F2_1  reg  ','  src
 #endif
 				emit2( (int) displ.val );  break;
 		      case BX:  emit2( 0x7400 | $4<<4 | $2 );
-				emit2( index<<8 );  break;
+				emit2( offset<<8 );  break;
 		      default:  argerr();
 		  }
 		}
@@ -193,7 +193,7 @@ f2	: F2_1  reg  ','  src
 				   emit2( (int) displ.val );
 				   break;
 			  case BX: emit2( 0x7000 | $1 | $4<<4 | $2 );
-				   emit2( index<<8 );
+				   emit2( offset<<8 );
 				   break;
 			  default: argerr();
 		      }
@@ -213,7 +213,7 @@ f2	: F2_1  reg  ','  src
 				   emit2( (int) displ.val );
 				   break;
 			  case BX: emit2( 0x7200 | $1 | $2<<4 | $4 );
-				   emit2( index<<8 );
+				   emit2( offset<<8 );
 				   break;
 			  default: argerr();
 		      }
@@ -263,7 +263,7 @@ f2	: F2_1  reg  ','  src
 				   emit2((int) displ.val );
 				   break;
 			  case BX: emit2( 0x7500 | $4<<4 | $2 );
-				   emit2( index<<8 );
+				   emit2( offset<<8 );
 				   break;
 			  default: argerr();
 		      }
@@ -283,7 +283,7 @@ f2	: F2_1  reg  ','  src
 				   emit2( (int) displ.val );
 				   break;
 			  case BX: emit2( 0x7700 | $2<<4 | $4 );
-				   emit2( index<<8 );
+				   emit2( offset<<8 );
 				   break;
 			  default: argerr();
 		      }
@@ -568,6 +568,6 @@ ba	: R32  '('  '$'  expr  ')'
 bx	: R32  '('  R16  ')'
 		{ if ( $1 == 0 || $3 == 0 ) regerr();
 		  $$ = $1;
-		  index = $3;
+		  offset = $3;
 		}
 	;
-- 
2.34.1