From 6aa187a695bd86b190c0d9e06ffb125ecc86672a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 3 Sep 2005 20:57:58 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/RageFileBasic.cpp                         | 2 +-
 stepmania/src/RageFileManager.cpp                       | 6 +++---
 stepmania/src/RageLog.cpp                               | 2 +-
 stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/RageFileBasic.cpp b/stepmania/src/RageFileBasic.cpp
index 600ae547e4..238218fc3f 100644
--- a/stepmania/src/RageFileBasic.cpp
+++ b/stepmania/src/RageFileBasic.cpp
@@ -317,7 +317,7 @@ int RageFileObj::GetLine( CString &out )
 
 // Always use "\r\n".  Even though the program may be running on Unix, the
 // files written to a memory card are likely to be edited using Windows.
-//#if defined(_WIN32)
+//#if defined(WIN32)
 #define NEWLINE "\r\n"
 //#else
 //#define NEWLINE "\n"
diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp
index 129f34d673..f1506a94c1 100644
--- a/stepmania/src/RageFileManager.cpp
+++ b/stepmania/src/RageFileManager.cpp
@@ -12,7 +12,7 @@
 #include <sys/stat.h>
 #endif
 
-#if defined(_WIN32) && !defined(XBOX)
+#if defined(WIN32) && !defined(XBOX)
 #include <windows.h>
 #endif
 
@@ -173,7 +173,7 @@ static CString GetDirOfExecutable( CString argv0 )
 	/* argv[0] can be wrong in most OS's; try to avoid using it. */
 
 	CString sPath;
-#if defined(_WIN32)
+#if defined(WIN32)
 	char buf[MAX_PATH];
 	GetModuleFileName( NULL, buf, sizeof(buf) );
 	sPath = buf;
@@ -186,7 +186,7 @@ static CString GetDirOfExecutable( CString argv0 )
 	bool IsAbsolutePath = false;
 	if( sPath.size() == 0 || sPath[0] == '/' )
 		IsAbsolutePath = true;
-#if defined(_WIN32)
+#if defined(WIN32)
 	if( sPath.size() > 2 && sPath[1] == ':' && sPath[2] == '/' )
 		IsAbsolutePath = true;
 #endif
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 17e19531f2..8f7d889dc8 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -274,7 +274,7 @@ void RageLog::Flush()
  * way, crash handlers can simply write() the buffer to a file without having
  * to convert line endings, which is tedious when you can't malloc(). */
 
-#if defined(_WIN32)
+#if defined(WIN32)
 #define NEWLINE "\r\n"
 #else
 #define NEWLINE "\n"
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 325dec5634..f43d17e78d 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -17,7 +17,7 @@
 
 namespace avcodec
 {
-#if defined(_WIN32)
+#if defined(WIN32)
 #include "ffmpeg/include/ffmpeg/avformat.h"
 #else
 #include <ffmpeg/avformat.h>