[runtime] Remove glib usage from public headers. (#4242)

diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index d8bdf35dfa53913f53b3eca1724b804ae856bfc5..baaa2af993a468c4cc8eed506c3d82e3c419bb79 100644 (file)
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -1073,7 +1073,7 @@ mono_error_set_pending_exception (MonoError *error)
 }
 
 void
-mono_install_unhandled_exception_hook (MonoUnhandledExceptionFunc func, gpointer user_data)
+mono_install_unhandled_exception_hook (MonoUnhandledExceptionFunc func, void *user_data)
 {
        unhandled_exception_hook = func;
        unhandled_exception_hook_data = user_data;

diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index ca146fafa9613122e4f5fd62b2b7050ade22a084..35ae5d69e523474e1b4c0c966d7993d2af7d6159 100644 (file)
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -1,7 +1,6 @@
 #ifndef _MONO_METADATA_EXCEPTION_H_
 #define _MONO_METADATA_EXCEPTION_H_
 
-#include <glib.h>
 #include <mono/metadata/object.h>
 #include <mono/metadata/image.h>
 
@@ -154,8 +153,8 @@ mono_get_exception_runtime_wrapped (MonoObject *wrapped_exception);
  * This hook isn't expected to return.
  * If no hook has been installed, the runtime will print a message before aborting.
  */
-typedef void  (*MonoUnhandledExceptionFunc)         (MonoObject *exc, gpointer user_data);
-MONO_API void mono_install_unhandled_exception_hook (MonoUnhandledExceptionFunc func, gpointer user_data);
+typedef void  (*MonoUnhandledExceptionFunc)         (MonoObject *exc, void *user_data);
+MONO_API void mono_install_unhandled_exception_hook (MonoUnhandledExceptionFunc func, void *user_data);
 void          mono_invoke_unhandled_exception_hook  (MonoObject *exc);
 
 MONO_END_DECLS

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index d0c5a05e664b908f65ef3578b42ec835b67c5f1c..e93565dc630060000fd655f89966343c954bb5ea 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -36,7 +36,6 @@ typedef void*    (*MonoCompileFunc)        (MonoMethod *method);
 typedef void       (*MonoMainThreadFunc)    (void* user_data);
 
 #define MONO_OBJECT_SETREF(obj,fieldname,value) do {   \
-               g_assert (sizeof((obj)->fieldname) == sizeof (gpointer*));      \
                mono_gc_wbarrier_set_field ((MonoObject*)(obj), &((obj)->fieldname), (MonoObject*)value);       \
                /*(obj)->fieldname = (value);*/ \
        } while (0)