projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2720 from mono/fix-39325
[mono.git]
/
mono
/
utils
/
mono-tls.h
diff --git
a/mono/utils/mono-tls.h
b/mono/utils/mono-tls.h
index 7622c6dae4641a8b690b769d0d731c9ee8bdbb0c..565b3fe593b6a89fd9908f88e8b3d71424f05da8 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)
*
* 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__
*/
#ifndef __MONO_TLS_H__
@@
-25,7
+26,8
@@
typedef enum {
TLS_KEY_SGEN_TLAB_NEXT_ADDR = 5,
TLS_KEY_SGEN_TLAB_TEMP_END = 6,
TLS_KEY_BOEHM_GC_THREAD = 7,
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_NUM = 9
} MonoTlsKey;
#ifdef HOST_WIN32
} MonoTlsKey;
#ifdef HOST_WIN32
@@
-48,7
+50,7
@@
typedef enum {
static inline int
mono_native_tls_alloc (MonoNativeTlsKey *key, void *destructor)
{
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
}
static inline void