From 11cff15f6f37099bd3c7104693be17c7deedcd39 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 18 Jul 2006 03:58:34 +0000 Subject: [PATCH] Fix VC8 macro redef warning. (DONE!) --- stepmania/src/archutils/Win32/CrashHandlerChild.cpp | 2 +- stepmania/src/archutils/Win32/DialogUtil.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp index be215a439d..e3cab7d255 100644 --- a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp @@ -117,7 +117,7 @@ namespace VDDebugInfo pctx->sRawBlock = RString(); pctx->pRVAHeap = NULL; - GetVDIPath( pctx->sFilename, ARRAYSIZE(pctx->sFilename) ); + GetVDIPath( pctx->sFilename, ARRAY_SIZE(pctx->sFilename) ); pctx->sError = RString(); HANDLE h = CreateFile( pctx->sFilename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); diff --git a/stepmania/src/archutils/Win32/DialogUtil.cpp b/stepmania/src/archutils/Win32/DialogUtil.cpp index d15373478b..54f4f2f7e5 100644 --- a/stepmania/src/archutils/Win32/DialogUtil.cpp +++ b/stepmania/src/archutils/Win32/DialogUtil.cpp @@ -62,7 +62,7 @@ void DialogUtil::LocalizeDialogAndContents( HWND hdlg ) RString sGroup; { - ::GetWindowText( hdlg, szTemp, ARRAYSIZE(szTemp) ); + ::GetWindowText( hdlg, szTemp, ARRAY_SIZE(szTemp) ); RString s = szTemp; sGroup = "Dialog-"+s; s = THEME->GetString( sGroup, s ); @@ -71,7 +71,7 @@ void DialogUtil::LocalizeDialogAndContents( HWND hdlg ) for( HWND hwndChild = ::GetTopWindow(hdlg); hwndChild != NULL; hwndChild = ::GetNextWindow(hwndChild,GW_HWNDNEXT) ) { - ::GetWindowText( hwndChild, szTemp, ARRAYSIZE(szTemp) ); + ::GetWindowText( hwndChild, szTemp, ARRAY_SIZE(szTemp) ); RString s = szTemp; if( s.empty() ) continue;