Merge pull request #3142 from henricm/fix-for-win-mono_string_to_utf8

[mono.git] / mono / utils / mono-tls.h

diff --git a/mono/utils/mono-tls.h b/mono/utils/mono-tls.h
index 7622c6dae4641a8b690b769d0d731c9ee8bdbb0c..2c3ed31df4539c5aa6813646d062bfb03fbdef9f 100644 (file)
--- a/mono/utils/mono-tls.h
+++ b/mono/utils/mono-tls.h
@@ -6,6 +6,7 @@
  *
  * Copyright 2011 Novell, Inc (http://www.novell.com)
  * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 #ifndef __MONO_TLS_H__
@@ -25,7 +26,9 @@ typedef enum {
        TLS_KEY_SGEN_TLAB_NEXT_ADDR = 5,
        TLS_KEY_SGEN_TLAB_TEMP_END = 6,
        TLS_KEY_BOEHM_GC_THREAD = 7,
-       TLS_KEY_NUM = 8
+       TLS_KEY_LMF_ADDR = 8,
+       TLS_KEY_SGEN_IN_CRITICAL_REGION_ADDR = 9,
+       TLS_KEY_NUM = 10
 } MonoTlsKey;
 
 #ifdef HOST_WIN32
@@ -48,7 +51,7 @@ typedef enum {
 static inline int
 mono_native_tls_alloc (MonoNativeTlsKey *key, void *destructor)
 {
-       return pthread_key_create (key, destructor) == 0;
+       return pthread_key_create (key, (void (*)(void*)) destructor) == 0;
 }
 
 static inline void