From 60b3ea15c32a603d7822bc3b845a92763198f513 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 11 Dec 2010 16:47:03 +0000
Subject: [PATCH] Switch _WINDOWS for _WIN32, as _WINDOWS doesn't seem to be
 defined using MSVC 2010 headers. On the other hand, _WIN32 is always defined
 by the compiler.

Originally committed to SVN as r4955.
---
 aegisub/src/audio_provider_pcm.cpp | 8 ++++----
 aegisub/src/audio_provider_pcm.h   | 4 ++--
 aegisub/src/frame_main.cpp         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aegisub/src/audio_provider_pcm.cpp b/aegisub/src/audio_provider_pcm.cpp
index 22f3e51eb..ba1df2c65 100644
--- a/aegisub/src/audio_provider_pcm.cpp
+++ b/aegisub/src/audio_provider_pcm.cpp
@@ -64,7 +64,7 @@
 ///
 PCMAudioProvider::PCMAudioProvider(const wxString &filename)
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	file_handle = CreateFile(
 		filename.c_str(),
 		FILE_READ_DATA,
@@ -123,7 +123,7 @@ PCMAudioProvider::PCMAudioProvider(const wxString &filename)
 ///
 PCMAudioProvider::~PCMAudioProvider()
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if (current_mapping) {
 		UnmapViewOfFile(current_mapping);
 	}
@@ -154,7 +154,7 @@ char * PCMAudioProvider::EnsureRangeAccessible(int64_t range_start, int64_t rang
 	if (!current_mapping || range_start < mapping_start || range_start+range_length > mapping_start+(int64_t)mapping_length) {
 		// It's not visible, change the current mapping
 		if (current_mapping) {
-#ifdef _WINDOWS
+#ifdef _WIN32
 			UnmapViewOfFile(current_mapping);
 #else
 			munmap(current_mapping, mapping_length);
@@ -184,7 +184,7 @@ char * PCMAudioProvider::EnsureRangeAccessible(int64_t range_start, int64_t rang
 		// We already checked that the requested range doesn't extend over the end of the file
 		// Hopefully this should ensure that small files are always mapped in their entirety
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 		LARGE_INTEGER mapping_start_li;
 		mapping_start_li.QuadPart = mapping_start;
 		current_mapping = MapViewOfFile(
diff --git a/aegisub/src/audio_provider_pcm.h b/aegisub/src/audio_provider_pcm.h
index 2c036cea1..e81c80f65 100644
--- a/aegisub/src/audio_provider_pcm.h
+++ b/aegisub/src/audio_provider_pcm.h
@@ -41,7 +41,7 @@
 #include <wx/thread.h>
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -55,7 +55,7 @@
 /// DOCME
 class PCMAudioProvider : public AudioProvider {
 private:
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 	/// DOCME
 	HANDLE file_handle;
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index cbab97c05..8b98a5c77 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -149,7 +149,7 @@ FrameMain::FrameMain (wxArrayString args)
 
 	// Set icon
 	StartupLog(_T("Set icon"));
-#ifdef _WINDOWS
+#ifdef _WIN32
 	SetIcon(wxICON(wxicon));
 #else
 	wxIcon icon;