From be38df7eac27c5f8cc24f6d548bcbdd4606c78cf Mon Sep 17 00:00:00 2001
From: Ted Percival <midg3t@users.sourceforge.net>
Date: Sun, 20 Mar 2005 11:20:58 +0000
Subject: [PATCH] rename identifier "or"->"optrow" to resolve gcc build error

---
 stepmania/src/ScreenMiniMenu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp
index 6218cb2659..8be7a6c637 100644
--- a/stepmania/src/ScreenMiniMenu.cpp
+++ b/stepmania/src/ScreenMiniMenu.cpp
@@ -82,10 +82,10 @@ void ScreenMiniMenu::Init( const Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMe
 
 void ScreenMiniMenu::ImportOptions( int r, PlayerNumber pn )
 {
-	OptionRow &or = *m_Rows[r];
+	OptionRow &optrow = *m_Rows[r];
 	MenuRow &mr = m_vMenuRows[r];
 	if( !mr.choices.empty() )
-		or.SetOneSharedSelection( mr.iDefaultChoice );
+		optrow.SetOneSharedSelection( mr.iDefaultChoice );
 }
 
 void ScreenMiniMenu::ExportOptions( int r, PlayerNumber pn )