Fix compilation errors in mono/utils/os-event-win32.c with Mingw/GCC (#3818)

This was introduced in 92be5357d12ecf0cc4c51fbcb76fc0514b375d1c. The patch
also adds the os-event-win32.c file to the libmonoutils Visual Studio project.

diff --git a/mono/utils/os-event-win32.c b/mono/utils/os-event-win32.c
index 26ce59e7218da2aee88d26e5f62c387991881d00..422283acf078a0613d7644c4b88e19f744288b45 100644 (file)
--- a/mono/utils/os-event-win32.c
+++ b/mono/utils/os-event-win32.c
@@ -15,7 +15,7 @@
 #include "atomic.h"
 
 void
-mono_os_event_init (MonoOSEvent *event, gboolean manual, gboolean initial, MonoOSEventFreeCb free_cb)
+mono_os_event_init (MonoOSEvent *event, gboolean manual, gboolean initial)
 {
        g_assert (event);
 

diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj
index 5f2d80f47a6dee4d3cf0566fa981ec9ba4216a07..f43c59b78940fc31e518f85a2a2be64893a315c6 100644 (file)
--- a/msvc/libmonoutils.vcxproj
+++ b/msvc/libmonoutils.vcxproj
@@ -122,6 +122,7 @@
     <ClCompile Include="..\mono\utils\mono-uri.c" />\r
     <ClCompile Include="..\mono\utils\mono-value-hash.c" />\r
     <ClCompile Include="..\mono\utils\monobitset.c" />\r
+    <ClCompile Include="..\mono\utils\os-event-win32.c" />\r
     <ClCompile Include="..\mono\utils\strenc.c" />\r
     <ClCompile Include="..\mono\utils\atomic.c" />\r
     <ClCompile Include="..\mono\utils\mono-hwcap.c" />\r
@@ -196,6 +197,7 @@
     <ClInclude Include="..\mono\utils\mono-uri.h" />\r
     <ClInclude Include="..\mono\utils\mono-value-hash.h" />\r
     <ClInclude Include="..\mono\utils\monobitset.h" />\r
+    <ClInclude Include="..\mono\utils\os-event.h" />\r
     <ClInclude Include="..\mono\utils\strenc.h" />\r
     <ClInclude Include="..\mono\utils\valgrind.h" />\r
     <ClInclude Include="..\mono\utils\atomic.h" />\r

diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters
index f74ea0cb33c66b7a97f36ed73dd04fc2f5716d84..8ee4fbe7c970d69acf6a6fec35b887ca710aaec5 100644 (file)
--- a/msvc/libmonoutils.vcxproj.filters
+++ b/msvc/libmonoutils.vcxproj.filters
@@ -196,6 +196,9 @@
     <ClCompile Include="..\mono\utils\mono-mmap-windows.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\mono\utils\os-event-win32.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\mono\utils\atomic.h">\r
@@ -417,6 +420,9 @@
     <ClInclude Include="..\mono\utils\mono-proclib-windows.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\mono\utils\os-event.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Filter Include="Header Files">\r