From 897dc783cd6af8e8d0973934ec7dc51acc160dc9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 30 Apr 2005 02:56:38 +0000 Subject: [PATCH] fix name conflict --- stepmania/src/Profile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 80f848b98a..2342444902 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -715,10 +715,10 @@ void Profile::IncrementCategoryPlayCount( StepsType st, RankingCategory rc ) // Loading and saving // -#define WARN LOG->Warn("Error parsing file at %s:%d",__FILE__,__LINE__); -#define WARN_AND_RETURN { WARN; return; } -#define WARN_AND_CONTINUE { WARN; continue; } -#define WARN_AND_BREAK { WARN; break; } +#define WARN_PARSER LOG->Warn("Error parsing file at %s:%d",__FILE__,__LINE__); +#define WARN_AND_RETURN { WARN_PARSER; return; } +#define WARN_AND_CONTINUE { WARN_PARSER; continue; } +#define WARN_AND_BREAK { WARN_PARSER; break; } #define WARN_M(m) LOG->Warn("Error parsing file at %s:%d: %s",__FILE__,__LINE__, (const char*) (m) ); #define WARN_AND_RETURN_M(m) { WARN_M(m); return; } #define WARN_AND_CONTINUE_M(m) { WARN_M(m); continue; }