Fix the windows build.
authorZoltan Varga <vargaz@gmail.com>
Sat, 10 Jan 2015 13:18:25 +0000 (08:18 -0500)
committerZoltan Varga <vargaz@gmail.com>
Sat, 10 Jan 2015 13:18:25 +0000 (08:18 -0500)
mono/utils/networking.h
msvc/libmonoruntime.vcxproj

index 1b5b4e5dd24fa11db20de5ac7edda6214b16f4bd..eeaa4cc509adbed02dcfac6d052346118d31a2fb 100644 (file)
@@ -25,7 +25,9 @@
 #include <sys/sockio.h>
 #endif
 
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 
 #ifdef HOST_WIN32
 #include <winsock2.h>
index 6e8c2d57a4913b6bd97b6671055216e96bcbbe88..e33dd96ad4bd033de1058e8e555cac2b23ca6922 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug_SGen|Win32">\r
@@ -87,7 +87,7 @@
     <ClCompile Include="..\mono\metadata\runtime.c" />\r
     <ClCompile Include="..\mono\metadata\security-core-clr.c" />\r
     <ClCompile Include="..\mono\metadata\security-manager.c" />\r
-    <ClCompile Include="..\mono\metadata\security.c" />\r
+    <ClCompile Include="..\mono\metadata\mono-security.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-alloc.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-bridge.c" />\r
     <ClCompile Include="..\mono\metadata\sgen-cardtable.c" />\r