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 #2454 from tastywheattasteslikechicken/FixVtableAbort
[mono.git]
/
mono
/
mini
/
mini-gc.c
diff --git
a/mono/mini/mini-gc.c
b/mono/mini/mini-gc.c
index 27a36204ca0c354e2448695293162924744d88c8..47265e1d10f50156070c8372ba7447619fb12436 100644
(file)
--- a/
mono/mini/mini-gc.c
+++ b/
mono/mini/mini-gc.c
@@
-10,7
+10,7
@@
#include "config.h"
#include "mini-gc.h"
#include "config.h"
#include "mini-gc.h"
-#include <mono/metadata/gc-internal.h>
+#include <mono/metadata/gc-internal
s
.h>
static gboolean
get_provenance (StackFrameInfo *frame, MonoContext *ctx, gpointer data)
static gboolean
get_provenance (StackFrameInfo *frame, MonoContext *ctx, gpointer data)
@@
-38,7
+38,7
@@
get_provenance_func (void)
//#if defined(MONO_ARCH_GC_MAPS_SUPPORTED)
#include <mono/metadata/sgen-conf.h>
//#if defined(MONO_ARCH_GC_MAPS_SUPPORTED)
#include <mono/metadata/sgen-conf.h>
-#include <mono/metadata/gc-internal.h>
+#include <mono/metadata/gc-internal
s
.h>
#include <mono/utils/mono-counters.h>
#define SIZEOF_SLOT ((int)sizeof (mgreg_t))
#include <mono/utils/mono-counters.h>
#define SIZEOF_SLOT ((int)sizeof (mgreg_t))
@@
-597,7
+597,7
@@
thread_attach_func (void)
TlsData *tls;
tls = g_new0 (TlsData, 1);
TlsData *tls;
tls = g_new0 (TlsData, 1);
- tls->tid =
GetCurrentThreadId
();
+ tls->tid =
mono_native_thread_id_get
();
tls->info = mono_thread_info_current ();
stats.tlsdata_size += sizeof (TlsData);
tls->info = mono_thread_info_current ();
stats.tlsdata_size += sizeof (TlsData);
@@
-622,7
+622,7
@@
thread_suspend_func (gpointer user_data, void *sigctx, MonoContext *ctx)
return;
}
return;
}
- if (tls->tid !=
GetCurrentThreadId
()) {
+ if (tls->tid !=
mono_native_thread_id_get
()) {
/* Happens on osx because threads are not suspended using signals */
#ifndef TARGET_WIN32
gboolean res;
/* Happens on osx because threads are not suspended using signals */
#ifndef TARGET_WIN32
gboolean res;