Fixed compiler warning introduced in the last commit about redefining typedefs.

Redefinition of typedef 'foo' is a C11 feature [-Wtypedef-redefinition].

diff --git a/mono/metadata/mono-basic-block.h b/mono/metadata/mono-basic-block.h
index 16b0073f4c381044f3dcedc8bc02867b9b4f882a..18457249d125f50a01ade979eb4c330b592db1fc 100644 (file)
--- a/mono/metadata/mono-basic-block.h
+++ b/mono/metadata/mono-basic-block.h
@@ -2,7 +2,9 @@
 #define __MONO_METADATA_BASIC_BLOCK_H__
 
 #include <glib.h>
+#include <mono/metadata/metadata.h>
 #include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-error.h>
 
 G_BEGIN_DECLS
 
@@ -16,9 +18,6 @@ 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/runtime.h b/mono/metadata/runtime.h
index 5d0c3a923f10982dedb68cceaf36868cba763195..42b8d7d3d7796ab4a6add8b600bbe63de317acac 100644 (file)
--- a/mono/metadata/runtime.h
+++ b/mono/metadata/runtime.h
@@ -11,13 +11,12 @@
 #define _MONO_METADATA_RUNTIME_H_
 
 #include <glib.h>
+#include <mono/metadata/metadata.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/threadpool-internals.h b/mono/metadata/threadpool-internals.h
index cfef83fdcdfdf0fbd32d6e498c46040444823b06..165445c6a8562e116bb14c5ce7025254dd453553 100644 (file)
--- a/mono/metadata/threadpool-internals.h
+++ b/mono/metadata/threadpool-internals.h
@@ -2,11 +2,9 @@
 #define _MONO_THREADPOOL_INTERNALS_H_
 
 #include <glib.h>
+#include <mono/metadata/object.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/verify-internals.h b/mono/metadata/verify-internals.h
index 1a4aa88008c765f75ce9c6881b9e96f671de332b..d02816f656a6a3e54c4a29e3833b497c68260953 100644 (file)
--- a/mono/metadata/verify-internals.h
+++ b/mono/metadata/verify-internals.h
@@ -4,6 +4,7 @@
 #include <glib.h>
 #include <mono/metadata/metadata.h>
 #include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-error.h>
 
 G_BEGIN_DECLS
 
@@ -36,8 +37,6 @@ 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;