Remove glib.h dependency from metadata.h. Move mono_metadata_image_set_foreach to metadata-internals.h.

Author: lukaszunity

mono/metadata/metadata-internals.h

@@ -621,6 +621,8 @@ typedef struct {
 	char *aot_options;
 } MonoAotCacheConfig;
 
+typedef void(*MonoImageSetFunc) (MonoImageSet *imageSet, void* user_data);
+
 #define MONO_SIZEOF_METHOD_SIGNATURE (sizeof (struct _MonoMethodSignature) - MONO_ZERO_LEN_ARRAY * SIZEOF_VOID_P)
 
 static inline gboolean
@@ -722,6 +724,8 @@ mono_image_set_unlock (MonoImageSet *set);
 char*
 mono_image_set_strdup (MonoImageSet *set, const char *s);
 
+void mono_metadata_image_set_foreach(MonoImageSetFunc func, gpointer user_data);
+
 #define mono_image_set_new0(image,type,size) ((type *) mono_image_set_alloc0 (image, sizeof (type)* (size)))
 
 gboolean

mono/metadata/metadata.c

@@ -5082,7 +5082,7 @@ mono_metadata_generic_class_is_valuetype (MonoGenericClass *gclass)
 
 typedef struct
 {
-	GFunc func;
+	MonoGenericClassFunc func;
 	gpointer user_data;
 } GenericClassForeachData;
 
@@ -5095,7 +5095,7 @@ generic_class_foreach_callback(gpointer key, gpointer value, gpointer user_data)
 }
 
 void
-mono_metadata_generic_class_foreach(GFunc func, gpointer user_data)
+mono_metadata_generic_class_foreach(MonoGenericClassFunc func, void* user_data)
 {
 	GenericClassForeachData data;
 	guint i;
@@ -5119,7 +5119,7 @@ mono_metadata_generic_class_foreach(GFunc func, gpointer user_data)
 }
 
 void
-mono_metadata_image_set_foreach(GFunc func, gpointer user_data)
+mono_metadata_image_set_foreach(MonoImageSetFunc func, gpointer user_data)
 {
 	GenericClassForeachData data;
 	guint i;

mono/metadata/metadata.h

@@ -10,7 +10,6 @@
 #include <mono/metadata/blob.h>
 #include <mono/metadata/row-indexes.h>
 #include <mono/metadata/image.h>
-#include <glib.h>
 
 MONO_BEGIN_DECLS
 
@@ -333,6 +332,8 @@ typedef enum {
 	MONO_PARSE_FIELD
 } MonoParseTypeMode;
 
+typedef void(*MonoGenericClassFunc) (MonoGenericClass *genericClass, void* user_data);
+
 MONO_API mono_bool
 mono_type_is_byref       (MonoType *type);
 
@@ -424,8 +425,7 @@ MONO_API int            mono_type_stack_size            (MonoType        *type,
 
 MONO_API mono_bool       mono_type_generic_inst_is_valuetype      (MonoType *type);
 MONO_API mono_bool       mono_metadata_generic_class_is_valuetype (MonoGenericClass *gclass);
-MONO_API void            mono_metadata_image_set_foreach(GFunc func, gpointer user_data);
-MONO_API void            mono_metadata_generic_class_foreach(GFunc func, gpointer user_data);
+MONO_API void            mono_metadata_generic_class_foreach(MonoGenericClassFunc func, void* user_data);
 
 MONO_API unsigned int          mono_metadata_type_hash         (MonoType *t1);
 MONO_API mono_bool       mono_metadata_type_equal        (MonoType *t1, MonoType *t2);