From ddc2c030d0dbdccd2905ecc717da9cc7e4635a1f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 27 Feb 2004 00:31:06 +0000
Subject: [PATCH] compile fix

---
 stepmania/src/MemoryCardManager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp
index ab7ad4acfc..7c74d3f9c8 100644
--- a/stepmania/src/MemoryCardManager.cpp
+++ b/stepmania/src/MemoryCardManager.cpp
@@ -187,8 +187,8 @@ void MemoryCardManager::AssignUnassignedCards()
 			{
 				for( i=0; i<vUnassignedDevices.size(); i++ )
 				{
-					UsbStorageDevice &usd = vUnassignedDevices[i];
-					if( usd.sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p]) == 0 )	// match
+					UsbStorageDevice &usbd = vUnassignedDevices[i];
+					if( usbd.sOsMountDir.CompareNoCase(PREFSMAN->m_sMemoryCardOsMountPoint[p]) == 0 )	// match
 					{
 						LOG->Trace( "dir match:  iUsbStorageIndex: %d, iBus: %d, iDeviceOnBus: %d, iPortOnHub: %d",
 							usbd.iUsbStorageIndex, usbd.iBus, usbd.iDeviceOnBus, usbd.iPortOnHub );
@@ -200,14 +200,14 @@ void MemoryCardManager::AssignUnassignedCards()
 			// search for USB bus match
 			for( i=0; i<vUnassignedDevices.size(); i++ )
 			{
-				UsbStorageDevice &usd = vUnassignedDevices[i];
+				UsbStorageDevice &usbd = vUnassignedDevices[i];
 
 				if( PREFSMAN->m_iMemoryCardUsbBus[p] != -1 && 
-					PREFSMAN->m_iMemoryCardUsbBus[p] != usd.iBus )
+					PREFSMAN->m_iMemoryCardUsbBus[p] != usbd.iBus )
 					continue;	// not a match
 
 				if( PREFSMAN->m_iMemoryCardUsbPort[p] != -1 && 
-					PREFSMAN->m_iMemoryCardUsbPort[p] != usd.iPortOnHub )
+					PREFSMAN->m_iMemoryCardUsbPort[p] != usbd.iPortOnHub )
 					continue;	// not a match
 
 				LOG->Trace( "bus/port match:  iUsbStorageIndex: %d, iBus: %d, iDeviceOnBus: %d, iPortOnHub: %d",