Correct conditional compilation & move logger source files to correct place

diff --git a/mono/utils/mono-log-windows.c b/mono/utils/mono-log-windows.c
index 8a99710df1548fe1baadbbda9156d50131e25b2f..95933dc26c90c47a75acec9ad2e8dd96b6f7e799 100644 (file)
--- a/mono/utils/mono-log-windows.c
+++ b/mono/utils/mono-log-windows.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef WIN32
+#ifdef HOST_WIN32
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index 906e7815a2b9327f373364ea2d86c747102d1369..3807b9a4ff72d782b025df25d7faa3eb8907cfb7 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -42,6 +42,9 @@
     <ClCompile Include="..\mono\utils\mono-io-portability.c" />\r
     <ClCompile Include="..\mono\utils\mono-linked-list-set.c" />\r
     <ClCompile Include="..\mono\utils\mono-logger.c" />\r
+    <ClCompile Include="..\mono\utils\mono-log-windows.c" />\r
+    <ClCompile Include="..\mono\utils\mono-log-common.c" />\r
+    <ClCompile Include="..\mono\utils\mono-log-posix.c" />\r
     <ClCompile Include="..\mono\utils\mono-math.c" />\r
     <ClCompile Include="..\mono\utils\mono-md5.c" />\r
     <ClCompile Include="..\mono\utils\mono-mmap.c" />\r
@@ -110,9 +113,6 @@
     <ClInclude Include="..\mono\utils\mono-dl.h" />\r
     <ClInclude Include="..\mono\utils\mono-error-internals.h" />\r
     <ClInclude Include="..\mono\utils\mono-error.h" />\r
-    <ClInclude Include="..\mono\utils\mono-log-windows.c" />\r
-    <ClInclude Include="..\mono\utils\mono-log-common.c" />\r
-    <ClInclude Include="..\mono\utils\mono-log-posix.c" />\r
     <ClInclude Include="..\mono\utils\mono-internal-hash.h" />\r
     <ClInclude Include="..\mono\utils\mono-io-portability.h" />\r
     <ClInclude Include="..\mono\utils\mono-linked-list-set.h" />\r