[runtime] Fix a few warnings.
authorMark Probst <mark.probst@gmail.com>
Thu, 7 May 2015 21:45:07 +0000 (14:45 -0700)
committerMark Probst <mark.probst@gmail.com>
Thu, 7 May 2015 21:45:25 +0000 (14:45 -0700)
mono/sgen/sgen-thread-pool.c
mono/utils/lock-free-alloc.c
mono/utils/lock-free-array-queue.c

index 305a423d2b121ce62a3fa84d5207032fe0d71266..298eab9452258f89e9a7d02eefb738b42b8734ab 100644 (file)
@@ -149,7 +149,7 @@ thread_func (void *thread_data)
                }
        }
 
-       return 0;
+       return (mono_native_thread_return_t)0;
 }
 
 void
index 55d7937025445975608cc478a13439e87a5def1d..308ab12dda8037eed792642c24d7b6fafccb56a2 100644 (file)
@@ -155,7 +155,7 @@ alloc_sb (Descriptor *desc)
                pagesize = mono_pagesize ();
 
        sb_header = desc->block_size == pagesize ?
-               mono_valloc (0, desc->block_size, prot_flags_for_activate (TRUE)) :
+               mono_valloc (NULL, desc->block_size, prot_flags_for_activate (TRUE)) :
                mono_valloc_aligned (desc->block_size, desc->block_size, prot_flags_for_activate (TRUE));
 
        g_assert (sb_header == sb_header_for_addr (sb_header, desc->block_size));
@@ -196,7 +196,7 @@ desc_alloc (void)
                        Descriptor *d;
                        int i;
 
-                       desc = (Descriptor *) mono_valloc (0, desc_size * NUM_DESC_BATCH, prot_flags_for_activate (TRUE));
+                       desc = (Descriptor *) mono_valloc (NULL, desc_size * NUM_DESC_BATCH, prot_flags_for_activate (TRUE));
 
                        /* Organize into linked list. */
                        d = desc;
index 1bafb685d63fb53cbbc971ee1fddbc2f30f78b32..98a3f31745a67bbc88d0a21ceae14c29d3b3b365 100644 (file)
@@ -44,7 +44,7 @@ alloc_chunk (MonoLockFreeArray *arr)
 {
        int size = mono_pagesize ();
        int num_entries = (size - (sizeof (Chunk) - arr->entry_size * MONO_ZERO_LEN_ARRAY)) / arr->entry_size;
-       Chunk *chunk = (Chunk *) mono_valloc (0, size, MONO_MMAP_READ | MONO_MMAP_WRITE);
+       Chunk *chunk = (Chunk *) mono_valloc (NULL, size, MONO_MMAP_READ | MONO_MMAP_WRITE);
        g_assert (chunk);
        chunk->num_entries = num_entries;
        return chunk;