Fixed Mono includes to be able to be included independently.

diff --git a/mono/metadata/attach.h b/mono/metadata/attach.h
index 19ad3ca58e01d917ff50fc78f1b7a40d0a575b4b..b396ed12ed2aa4ae8197ff5a9a9a6ec6791e1b98 100644 (file)
--- a/mono/metadata/attach.h
+++ b/mono/metadata/attach.h
@@ -1,6 +1,9 @@
 #ifndef __MONO_ATTACH_H__
 #define __MONO_ATTACH_H__
 
+#include <glib.h>
+#include <mono/utils/mono-compiler.h>
+
 G_BEGIN_DECLS
 
 void

diff --git a/mono/metadata/char-conversions.h b/mono/metadata/char-conversions.h
index 3517e76a90f414e1c46d8cfbffa90fc243bc2509..5628ce7dd656dabd757ef054b67e8fb93bcc887c 100644 (file)
--- a/mono/metadata/char-conversions.h
+++ b/mono/metadata/char-conversions.h
@@ -1,6 +1,8 @@
 #ifndef _MONO_METADATA_CHAR_CONVERSIONS_H_
 #define _MONO_METADATA_CHAR_CONVERSIONS_H_ 1
 
+#include <glib.h>
+
 /*
  * The CategoryData_v2* tables below are automatically generated
  * by create-category-table(.cs), available in the mcs

diff --git a/mono/metadata/console-io.h b/mono/metadata/console-io.h
index a7ef7686b68930b69490f9879aa3bcd371e566f9..669305111503d8e209693a6e2f2d550a3bde318b 100644 (file)
--- a/mono/metadata/console-io.h
+++ b/mono/metadata/console-io.h
@@ -15,6 +15,7 @@
 
 #include <mono/metadata/object.h>
 #include <mono/io-layer/io-layer.h>
+#include <mono/utils/mono-compiler.h>
 
 G_BEGIN_DECLS
 

diff --git a/mono/metadata/coree.h b/mono/metadata/coree.h
index a2bec50a0fe051ab75a1e7a55b236b75b16c25f8..e5f842f2528f95bb6b565a9a6807623a3ed1124b 100644 (file)
--- a/mono/metadata/coree.h
+++ b/mono/metadata/coree.h
@@ -11,10 +11,12 @@
 #define __MONO_COREE_H__
 
 #include <config.h>
+#include <glib.h>
 
 #ifdef HOST_WIN32
 
 #include <mono/io-layer/io-layer.h>
+#include <mono/utils/mono-compiler.h>
 #include "image.h"
 
 #define STATUS_SUCCESS 0x00000000L

diff --git a/mono/metadata/culture-info.h b/mono/metadata/culture-info.h
index 50e174ffe06743bef71b34b395e589b3227ed0df..5ee2eaf03f3a840e974db2f53d8c0e4fe078f85a 100644 (file)
--- a/mono/metadata/culture-info.h
+++ b/mono/metadata/culture-info.h
@@ -3,6 +3,7 @@
 #define _MONO_METADATA_CULTURE_INFO_H_ 1
 
 #include <glib.h>
+#include <mono/metadata/object.h>
 
 #define NUM_DAYS 7
 #define NUM_MONTHS 13

diff --git a/mono/metadata/decimal.h b/mono/metadata/decimal.h
index 43c782a207d3aff15b04a35cbe36d98831fc173d..e9737c752b1768dedc6f180187af135f821a8eb1 100644 (file)
--- a/mono/metadata/decimal.h
+++ b/mono/metadata/decimal.h
@@ -1,3 +1,7 @@
+#ifndef _MONO_DECIMAL_H_
+#define _MONO_DECIMAL_H_
+
+#include <glib.h>
 #include "mono/metadata/object.h"
 #include "mono/utils/mono-compiler.h"
 
@@ -45,3 +49,4 @@ gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 texp) MONO_
 
 gint32 mono_string2decimal(/*[Out]*/decimal_repr* pA, /*[In]*/MonoString* s, gint32 decrDecimal, gint32 sign) MONO_INTERNAL;
 
+#endif

diff --git a/mono/metadata/mono-basic-block.h b/mono/metadata/mono-basic-block.h
index 77abd7a46963d3454f2de103197738723e351176..16b0073f4c381044f3dcedc8bc02867b9b4f882a 100644 (file)
--- a/mono/metadata/mono-basic-block.h
+++ b/mono/metadata/mono-basic-block.h
@@ -2,7 +2,7 @@
 #define __MONO_METADATA_BASIC_BLOCK_H__
 
 #include <glib.h>
-
+#include <mono/utils/mono-compiler.h>
 
 G_BEGIN_DECLS
 
@@ -16,6 +16,8 @@ struct _MonoSimpleBasicBlock {
        unsigned dead     : 1;
 };
 
+typedef struct _MonoMethod MonoMethod;
+typedef struct _MonoError MonoError;
 
 MonoSimpleBasicBlock*
 mono_basic_block_split (MonoMethod *method, MonoError *error) MONO_INTERNAL;

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index 0f96cf7ecc39ce5120a10fe9ef5e9cedcc9b29a4..8a62a1e10e7abae87a1e72dd7e59919ff157230f 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -26,7 +26,7 @@ typedef struct _MonoDynamicImage MonoDynamicImage;
 typedef struct _MonoReflectionMethodBody MonoReflectionMethodBody;
 typedef struct _MonoAppContext MonoAppContext;
 
-typedef struct {
+typedef struct _MonoObject {
        MonoVTable *vtable;
        MonoThreadsSync *synchronisation;
 } MonoObject;

diff --git a/mono/metadata/rand.h b/mono/metadata/rand.h
index 96b4efe76ffcf9a55c329ad965fc49bd3955e7f3..76864ca31cb05a7d0a9797b55aa35794179c6a89 100644 (file)
--- a/mono/metadata/rand.h
+++ b/mono/metadata/rand.h
@@ -12,6 +12,7 @@
 #ifndef _MONO_METADATA_RAND_H_
 #define _MONO_METADATA_RAND_H_
 
+#include <glib.h>
 #include <mono/metadata/object.h>
 #include "mono/utils/mono-compiler.h"
 

diff --git a/mono/metadata/runtime.h b/mono/metadata/runtime.h
index 83f17b7d33ec5ea767724f8f72af6d5ea1298960..5d0c3a923f10982dedb68cceaf36868cba763195 100644 (file)
--- a/mono/metadata/runtime.h
+++ b/mono/metadata/runtime.h
@@ -10,10 +10,14 @@
 #ifndef _MONO_METADATA_RUNTIME_H_
 #define _MONO_METADATA_RUNTIME_H_
 
+#include <glib.h>
 #include <mono/utils/mono-publib.h>
+#include <mono/utils/mono-compiler.h>
 
 MONO_BEGIN_DECLS
 
+typedef struct _MonoMethod MonoMethod;
+
 gboolean mono_runtime_is_critical_method (MonoMethod *method) MONO_INTERNAL;
 gboolean mono_runtime_try_shutdown (void) MONO_INTERNAL;
 

diff --git a/mono/metadata/security-core-clr.h b/mono/metadata/security-core-clr.h
index 83972c33f449312f1bb89ae7e93e04f6d1a15eee..987f7459686d79e9d0689ef0fac3e56f130cce51 100644 (file)
--- a/mono/metadata/security-core-clr.h
+++ b/mono/metadata/security-core-clr.h
@@ -10,7 +10,9 @@
 #ifndef _MONO_METADATA_SECURITY_CORE_CLR_H_
 #define _MONO_METADATA_SECURITY_CORE_CLR_H_
 
+#include <glib.h>
 #include <mono/metadata/reflection.h>
+#include <mono/utils/mono-compiler.h>
 
 typedef enum {
        /* We compare these values as integers, so the order must not

diff --git a/mono/metadata/security.h b/mono/metadata/security.h
index 6158ac820deb93329a60391887cb3310cb442ea9..f30f5e82e1c7aa834b779ec4490bb3140946544a 100644 (file)
--- a/mono/metadata/security.h
+++ b/mono/metadata/security.h
@@ -11,7 +11,10 @@
 #ifndef _MONO_METADATA_SECURITY_H_
 #define _MONO_METADATA_SECURITY_H_
 
+#include <glib.h>
 #include <mono/metadata/object.h>
+#include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-publib.h>
 
 G_BEGIN_DECLS
 

diff --git a/mono/metadata/sgen-conf.h b/mono/metadata/sgen-conf.h
index d22d92130ea4591deaf22bb44e7e96fdf598d91a..f44a4d4ace66c10eae1d458135d1f8e4fe82feb9 100644 (file)
--- a/mono/metadata/sgen-conf.h
+++ b/mono/metadata/sgen-conf.h
@@ -22,6 +22,8 @@
 #ifndef __MONO_SGENCONF_H__
 #define __MONO_SGENCONF_H__
 
+#include <glib.h>
+
 /*Basic defines and static tunables */
 
 #if SIZEOF_VOID_P == 4

diff --git a/mono/metadata/sgen-gc.h b/mono/metadata/sgen-gc.h
index 5f77d2b638c14265c93325aea90d15543d85949e..560191927b888e57b7034e0403d0539ad69113ec 100644 (file)
--- a/mono/metadata/sgen-gc.h
+++ b/mono/metadata/sgen-gc.h
@@ -717,7 +717,7 @@ void sgen_marksweep_conc_init (SgenMajorCollector *collector) MONO_INTERNAL;
 SgenMajorCollector* sgen_get_major_collector (void) MONO_INTERNAL;
 
 
-typedef struct {
+typedef struct _SgenRemeberedSet {
        void (*wbarrier_set_field) (MonoObject *obj, gpointer field_ptr, MonoObject* value);
        void (*wbarrier_set_arrayref) (MonoArray *arr, gpointer slot_ptr, MonoObject* value);
        void (*wbarrier_arrayref_copy) (gpointer dest_ptr, gpointer src_ptr, int count);
@@ -818,7 +818,7 @@ void sgen_bridge_processing_stw_step (void) MONO_INTERNAL;
 void sgen_bridge_processing_finish (int generation) MONO_INTERNAL;
 void sgen_register_test_bridge_callbacks (const char *bridge_class_name) MONO_INTERNAL;
 gboolean sgen_is_bridge_object (MonoObject *obj) MONO_INTERNAL;
-MonoGCBridgeObjectKind sgen_bridge_class_kind (MonoClass *class) MONO_INTERNAL;
+MonoGCBridgeObjectKind sgen_bridge_class_kind (MonoClass *klass) MONO_INTERNAL;
 void sgen_mark_bridge_object (MonoObject *obj) MONO_INTERNAL;
 void sgen_bridge_register_finalized_object (MonoObject *object) MONO_INTERNAL;
 void sgen_bridge_describe_pointer (MonoObject *object) MONO_INTERNAL;

diff --git a/mono/metadata/string-icalls.h b/mono/metadata/string-icalls.h
index a0889ebbf5837d886a69a5a5c44816b872be69e8..a0b831a1e2006411eecc26190d60ca4df45c4f27 100644 (file)
--- a/mono/metadata/string-icalls.h
+++ b/mono/metadata/string-icalls.h
@@ -10,6 +10,7 @@
  * (C) 2001 Ximian, Inc.
  */
 
+#include <glib.h>
 #include <mono/metadata/class.h>
 #include <mono/metadata/object.h>
 #include "mono/utils/mono-compiler.h"

diff --git a/mono/metadata/threadpool-internals.h b/mono/metadata/threadpool-internals.h
index 9d73ccdeb305ec3d353259fd537bf1e2f451ec7c..cfef83fdcdfdf0fbd32d6e498c46040444823b06 100644 (file)
--- a/mono/metadata/threadpool-internals.h
+++ b/mono/metadata/threadpool-internals.h
@@ -1,6 +1,12 @@
 #ifndef _MONO_THREADPOOL_INTERNALS_H_
 #define _MONO_THREADPOOL_INTERNALS_H_
 
+#include <glib.h>
+#include <mono/utils/mono-compiler.h>
+
+typedef struct _MonoArray MonoArray;
+typedef struct _MonoObject MonoObject;
+
 void mono_thread_pool_remove_socket (int sock) MONO_INTERNAL;
 gboolean mono_thread_pool_is_queue_array (MonoArray *o) MONO_INTERNAL;
 void mono_internal_thread_unhandled_exception (MonoObject* exc) MONO_INTERNAL;

diff --git a/mono/metadata/threads-types.h b/mono/metadata/threads-types.h
index 63aaa8f7c80db464f61a8e6922d6c6a00d6a19cd..6aeca4acf5eadfa05b80ac8c0fce89c155d48280 100644 (file)
--- a/mono/metadata/threads-types.h
+++ b/mono/metadata/threads-types.h
@@ -15,6 +15,7 @@
 #include <glib.h>
 
 #include <mono/io-layer/io-layer.h>
+#include <mono/metadata/object.h>
 #include "mono/utils/mono-compiler.h"
 #include "mono/utils/mono-membar.h"
 

diff --git a/mono/metadata/verify-internals.h b/mono/metadata/verify-internals.h
index afa0696546fabdfb47ceed348ea9f4c4b4d35e4a..1a4aa88008c765f75ce9c6881b9e96f671de332b 100644 (file)
--- a/mono/metadata/verify-internals.h
+++ b/mono/metadata/verify-internals.h
@@ -1,7 +1,9 @@
 #ifndef __MONO_METADATA_VERIFY_INTERNAL_H__
 #define __MONO_METADATA_VERIFY_INTERNAL_H__
 
+#include <glib.h>
 #include <mono/metadata/metadata.h>
+#include <mono/utils/mono-compiler.h>
 
 G_BEGIN_DECLS
 
@@ -34,6 +36,8 @@ gboolean mono_verifier_verify_table_data (MonoImage *image, GSList **error_list)
 
 gboolean mono_verifier_verify_full_table_data (MonoImage *image, GSList **error_list) MONO_INTERNAL;
 
+typedef struct _MonoError MonoError;
+
 gboolean mono_verifier_verify_field_signature (MonoImage *image, guint32 offset, GSList **error_list) MONO_INTERNAL;
 gboolean mono_verifier_verify_method_header (MonoImage *image, guint32 offset, GSList **error_list) MONO_INTERNAL;
 gboolean mono_verifier_verify_method_signature (MonoImage *image, guint32 offset, MonoError *error) MONO_INTERNAL;

diff --git a/mono/utils/mono-error.h b/mono/utils/mono-error.h
index 5652432adb15282bd0dc121df65e50604e9f81b5..1da46d6f24025414c314a3824850f4827537c164 100644 (file)
--- a/mono/utils/mono-error.h
+++ b/mono/utils/mono-error.h
@@ -33,7 +33,7 @@ enum {
 };
 
 /*Keep in sync with MonoErrorInternal*/
-typedef struct {
+typedef struct _MonoError {
        unsigned short error_code;
     unsigned short hidden_0; /*DON'T TOUCH */