--- libsidplay/emu/6581_.cpp.orig	Thu Jul  2 11:45:06 1998
+++ libsidplay/emu/6581_.cpp	Sun Jul 26 00:27:56 1998
@@ -112,6 +112,7 @@
 
 static uword defaultTimer, timer;
 
+uword zz_tmp;
 
 inline void calcValuesPerCall()
 {
@@ -261,10 +262,10 @@
 
 inline void noiseAdvanceHp(sidOperator* pVoice)
 {
-	udword tmp = pVoice->noiseStepAdd;
-	while (tmp >= (1L<<20))
+	udword tmp_aa = pVoice->noiseStepAdd;
+	while (tmp_aa >= (1L<<20))
 	{
-		tmp -= (1L<<20);
+		tmp_aa -= (1L<<20);
 #if defined(DIRECT_FIXPOINT)
 		pVoice->noiseReg.l = (pVoice->noiseReg.l << 1) | 
 			(((pVoice->noiseReg.l >> 22) ^ (pVoice->noiseReg.l >> 17)) & 1);
@@ -273,7 +274,7 @@
 			(((pVoice->noiseReg >> 22) ^ (pVoice->noiseReg >> 17)) & 1);
 #endif
 	}
-	pVoice->noiseStep += tmp;
+	pVoice->noiseStep += tmp_aa;
 	if (pVoice->noiseStep >= (1L<<20))
 	{
 		pVoice->noiseStep -= (1L<<20);
@@ -500,30 +501,30 @@
 			if ( filterType == 0x20 )
 			{
 				pVoice->filtLow += ( pVoice->filtRef * filterDy );
-				filterfloat tmp = (filterfloat)pVoice->filtIO - pVoice->filtLow;
-				tmp -= pVoice->filtRef * filterResDy;
-				pVoice->filtRef += ( tmp * (filterDy) );
+				filterfloat tmp_bb = (filterfloat)pVoice->filtIO - pVoice->filtLow;
+				tmp_bb -= pVoice->filtRef * filterResDy;
+				pVoice->filtRef += ( tmp_bb * (filterDy) );
 				pVoice->filtIO = (sbyte)(pVoice->filtRef-pVoice->filtLow/4);
 			}
 			else if (filterType == 0x40)
 			{
 				pVoice->filtLow += ( pVoice->filtRef * filterDy * 0.1 );
-				filterfloat tmp = (filterfloat)pVoice->filtIO - pVoice->filtLow;
-				tmp -= pVoice->filtRef * filterResDy;
-				pVoice->filtRef += ( tmp * (filterDy) );
-				filterfloat tmp2 = pVoice->filtRef - pVoice->filtIO/8;
-				if (tmp2 < -128)
-					tmp2 = -128;
-				if (tmp2 > 127)
-					tmp2 = 127;
-				pVoice->filtIO = (sbyte)tmp2;
+				filterfloat tmp_bb = (filterfloat)pVoice->filtIO - pVoice->filtLow;
+				tmp_bb -= pVoice->filtRef * filterResDy;
+				pVoice->filtRef += ( tmp_bb * (filterDy) );
+				filterfloat tmp_cc = pVoice->filtRef - pVoice->filtIO/8;
+				if (tmp_cc < -128)
+					tmp_cc = -128;
+				if (tmp_cc > 127)
+					tmp_cc = 127;
+				pVoice->filtIO = (sbyte)tmp_cc;
 			}
 			else
 			{
 				pVoice->filtLow += ( pVoice->filtRef * filterDy );
 				filterfloat sample = pVoice->filtIO;
 				filterfloat sample2 = sample - pVoice->filtLow;
-				int tmp = (int)sample2;
+				int tmp_dd = (int)sample2;
 				sample2 -= pVoice->filtRef * filterResDy;
 				pVoice->filtRef += ( sample2 * filterDy );
 			
@@ -537,15 +538,15 @@
 				}
 				else if ( filterType == 0x50 )
 				{
-					pVoice->filtIO = (sbyte)(sample - (tmp >> 1));
+					pVoice->filtIO = (sbyte)(sample - (tmp_dd >> 1));
 				}
 				else if ( filterType == 0x60 )
 				{
-					pVoice->filtIO = (sbyte)tmp;
+					pVoice->filtIO = (sbyte)tmp_dd;
 				}
 				else if ( filterType == 0x70 )
 				{
-					pVoice->filtIO = (sbyte)(sample - (tmp >> 1));
+					pVoice->filtIO = (sbyte)(sample - (tmp_dd >> 1));
 				}
 			}
 		}
@@ -667,9 +668,9 @@
 		if (doAutoPanning && updateAutoPanning)
 		{
 			// Swap source/destination position.
-			uword tmp = pVoice->gainSource;
+			uword tmp_ee = pVoice->gainSource;
 			pVoice->gainSource = pVoice->gainDest;
-			pVoice->gainDest = tmp;
+			pVoice->gainDest = tmp_ee;
 			if ((pVoice->gainDest^pVoice->gainSource) == 0)
 			{
 				// Mute voice.
@@ -700,9 +701,9 @@
 			else
 			{
 				// Swap source/destination position.
-				uword tmp = pVoice->gainSource;
+				zz_tmp = pVoice->gainSource;
 				pVoice->gainSource = pVoice->gainDest;
-				pVoice->gainDest = tmp;
+				pVoice->gainDest = zz_tmp;
 				// Inverse direction.
 				pVoice->gainDirec = false;
 			}
@@ -718,10 +719,10 @@
 			{
 				pVoice->gainDirec = true;
 				// Swap source/destination position.
-				uword tmp = pVoice->gainSource;
+				uword tmp_gg = pVoice->gainSource;
 				pVoice->gainSource = pVoice->gainDest;
 				// Inverse direction.
-				pVoice->gainDest = tmp;
+				pVoice->gainDest = tmp_gg;
 			}
 		}
 	}
