From b60e3a5bd49d53aaf47f0dffbed5b3ea472e6a7d Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Mon, 18 Jul 2011 01:08:41 +0000
Subject: [PATCH] Rename another clashing file in libaegisub.

Originally committed to SVN as r5490.
---
 .../libaegisub_vs2008/libaegisub_vs2008.vcproj | 18 +-----------------
 .../msbuild/libaegisub/libaegisub.vcxproj      |  2 +-
 .../libaegisub/libaegisub.vcxproj.filters      |  3 +++
 .../windows/{log.cpp => log_win.cpp}           |  0
 4 files changed, 5 insertions(+), 18 deletions(-)
 rename aegisub/libaegisub/windows/{log.cpp => log_win.cpp} (100%)

diff --git a/aegisub/build/libaegisub_vs2008/libaegisub_vs2008.vcproj b/aegisub/build/libaegisub_vs2008/libaegisub_vs2008.vcproj
index fec16d64f..b1f8df819 100644
--- a/aegisub/build/libaegisub_vs2008/libaegisub_vs2008.vcproj
+++ b/aegisub/build/libaegisub_vs2008/libaegisub_vs2008.vcproj
@@ -378,24 +378,8 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\libaegisub\windows\log.cpp"
+				RelativePath="..\..\libaegisub\windows\log_win.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\log_windows"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\log_windows"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\libaegisub\windows\path_win.cpp"
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
index 51b48bbcb..a46e9a9ad 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
@@ -101,7 +101,7 @@
     <ClCompile Include="$(SrcDir)windows\access.cpp" />
     <ClCompile Include="$(SrcDir)windows\charset_conv_win.cpp" />
     <ClCompile Include="$(SrcDir)windows\io.cpp" />
-    <ClCompile Include="$(SrcDir)windows\log.cpp" />
+    <ClCompile Include="$(SrcDir)windows\log_win.cpp" />
     <ClCompile Include="$(SrcDir)windows\path_win.cpp" />
     <ClCompile Include="$(SrcDir)windows\util_win.cpp" />
   </ItemGroup>
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
index 5fb4aa266..59d3ba579 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
@@ -151,6 +151,9 @@
     <ClCompile Include="$(SrcDir)common\log.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)windows\log_win.cpp">
+      <Filter>Source Files\Windows</Filter>
+    </ClCompile>
     <ClCompile Include="$(SrcDir)common\mru.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
diff --git a/aegisub/libaegisub/windows/log.cpp b/aegisub/libaegisub/windows/log_win.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/log.cpp
rename to aegisub/libaegisub/windows/log_win.cpp