Skip to content

Commit 3492bb2

Browse files
committed
Sync more API changes from Mono
1 parent 033f565 commit 3492bb2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

mono/metadata/il2cpp-compat-metadata.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#define mono_gc_make_vector_descr il2cpp_mono_gc_make_vector_descr
2121
#define mono_gc_deregister_root il2cpp_mono_gc_deregister_root
2222

23-
int il2cpp_mono_gc_register_root_wbarrier (char *start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, const char *msg);
23+
int il2cpp_mono_gc_register_root_wbarrier (char *start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, void *key, const char *msg);
2424
SgenDescriptor il2cpp_mono_gc_make_root_descr_all_refs(int numbits);
2525
MonoGCDescriptor il2cpp_mono_gc_make_vector_descr (void);
26-
void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, const char *msg);
26+
void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, void *key, const char *msg);
2727
gboolean il2cpp_mono_gc_is_moving();
2828

2929
typedef void* (*MonoGCLockedCallbackFunc) (void *data);

mono/mini/il2cpp-compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ MonoString* il2cpp_mono_ldstr_checked(MonoDomain* domain, MonoImage* image, guin
413413
Il2CppMonoObject* il2cpp_mono_runtime_try_invoke(MonoMethod* method, void* obj, void** params, Il2CppMonoObject** exc, MonoError* error);
414414
Il2CppMonoObject* il2cpp_mono_runtime_invoke_checked(MonoMethod* method, void* obj, void** params, MonoError* error);
415415
void il2cpp_mono_gc_base_init();
416-
int il2cpp_mono_gc_register_root(char* start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, const char* msg);
416+
int il2cpp_mono_gc_register_root(char* start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, void *key, const char* msg);
417417
void il2cpp_mono_gc_deregister_root(char* addr);
418418
gint32 il2cpp_mono_environment_exitcode_get();
419419
void il2cpp_mono_environment_exitcode_set(gint32 value);

mono/mini/il2cpp-stubs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ SgenDescriptor il2cpp_mono_gc_make_root_descr_all_refs(int numbits)
531531
return NULL;
532532
}
533533

534-
int il2cpp_mono_gc_register_root_wbarrier (char *start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, const char *msg)
534+
int il2cpp_mono_gc_register_root_wbarrier (char *start, size_t size, MonoGCDescriptor descr, MonoGCRootSource source, void *key, const char *msg)
535535
{
536536
il2cpp::gc::GarbageCollector::RegisterRoot(start, size);
537537
return 1;
@@ -1283,7 +1283,7 @@ void il2cpp_mono_error_assert_ok_pos (MonoError *error, const char* filename, in
12831283
g_error ("%s:%d\n", filename, lineno);
12841284
}
12851285

1286-
void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, const char *msg)
1286+
void* il2cpp_mono_gc_alloc_fixed (size_t size, void* descr, MonoGCRootSource source, void *key, const char *msg)
12871287
{
12881288
return il2cpp_gc_alloc_fixed(size);
12891289
}

0 commit comments

Comments
 (0)