[windows] Fixed some warnings when calling mono_cond_init.

Conflicts:
	mono/metadata/threadpool-ms-io.c

diff --git a/mono/metadata/threadpool-ms-io.c b/mono/metadata/threadpool-ms-io.c
index 23f5eeb9f3543a286b930faebf8debc76540d781..61aabcfdf602afc38a4a9784529a4032ee9e3adf 100644 (file)
--- a/mono/metadata/threadpool-ms-io.c
+++ b/mono/metadata/threadpool-ms-io.c
@@ -530,7 +530,7 @@ initialize (void)
        g_assert (threadpool_io);
 
        mono_mutex_init_recursive (&threadpool_io->updates_lock);
-       mono_cond_init (&threadpool_io->updates_cond, NULL);
+       mono_cond_init (&threadpool_io->updates_cond, 0);
        mono_gc_register_root ((void*)&threadpool_io->updates [0], sizeof (threadpool_io->updates), MONO_GC_DESCRIPTOR_NULL, MONO_ROOT_SOURCE_THREAD_POOL, "i/o thread pool updates list");
 
        threadpool_io->updates_size = 0;

diff --git a/mono/metadata/threadpool-ms.c b/mono/metadata/threadpool-ms.c
index d5e388d1e28186ec210c79788ea9f43bda0361e2..a5f92e9ca98ccc148f913af8f7e80e1b9f84b3c5 100644 (file)
--- a/mono/metadata/threadpool-ms.c
+++ b/mono/metadata/threadpool-ms.c
@@ -492,7 +492,7 @@ worker_park (void)
 
        mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] current worker parking", GetCurrentThreadId ());
 
-       mono_cond_init (&cond, NULL);
+       mono_cond_init (&cond, 0);
 
        mono_gc_set_skip_thread (TRUE);
 

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index e2b1172c392562151b9dafbc1851832205945471..9f341e78930ea505fd2c3eb73233b21676515fa9 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -973,7 +973,7 @@ mono_debugger_agent_init (void)
        event_requests = g_ptr_array_new ();
 
        mono_mutex_init (&debugger_thread_exited_mutex);
-       mono_cond_init (&debugger_thread_exited_cond, NULL);
+       mono_cond_init (&debugger_thread_exited_cond, 0);
 
        mono_profiler_install ((MonoProfiler*)&debugger_profiler, runtime_shutdown);
        mono_profiler_set_events (MONO_PROFILE_APPDOMAIN_EVENTS | MONO_PROFILE_THREADS | MONO_PROFILE_ASSEMBLY_EVENTS | MONO_PROFILE_JIT_COMPILATION | MONO_PROFILE_METHOD_EVENTS);
@@ -2491,7 +2491,7 @@ static void
 suspend_init (void)
 {
        mono_mutex_init (&suspend_mutex);
-       mono_cond_init (&suspend_cond, NULL);   
+       mono_cond_init (&suspend_cond, 0);      
        MONO_SEM_INIT (&suspend_sem, 0);
 }
 

diff --git a/mono/sgen/sgen-thread-pool.c b/mono/sgen/sgen-thread-pool.c
index 298eab9452258f89e9a7d02eefb738b42b8734ab..629b19a415159e6cf4b56982b271aa18cc0e3b7a 100644 (file)
--- a/mono/sgen/sgen-thread-pool.c
+++ b/mono/sgen/sgen-thread-pool.c
@@ -158,8 +158,8 @@ sgen_thread_pool_init (int num_threads, SgenThreadPoolThreadInitFunc init_func,
        SGEN_ASSERT (0, num_threads == 1, "We only support 1 thread pool thread for now.");
 
        mono_mutex_init (&lock);
-       mono_cond_init (&work_cond, NULL);
-       mono_cond_init (&done_cond, NULL);
+       mono_cond_init (&work_cond, 0);
+       mono_cond_init (&done_cond, 0);
 
        thread_init_func = init_func;
        idle_job_func = idle_func;