Tue Mar 4 12:40:58 CET 2003 Paolo Molaro <lupus@ximian.com>

	* object.h, threads.h: make include files compatible with C++
	(patch by Jerome Laban <jlaban@wanadoo.fr>).

svn path=/trunk/mono/; revision=12168

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index ab754d50c8966ee11b9e760a9da51fd2acc43536..6fcd914c68555202eaa5e6b84f9873e041e2b915 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Tue Mar 4 12:40:58 CET 2003 Paolo Molaro <lupus@ximian.com>
+
+       * object.h, threads.h: make include files compatible with C++
+       (patch by Jerome Laban <jlaban@wanadoo.fr>).
+
 2003-03-04  Pedro Martínez Juliá  <yoros@wanadoo.es>
 
        * icall.c: Erased ToString helper functions for Double and Single.

diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index 7a2b9586fb1ed8fdf08886cf0ecaae8e2d36579b..2625ef6acfcfec7593cf87f10faead2881e0ff56 100644 (file)
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -368,13 +368,13 @@ gpointer
 mono_load_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer *res);
 
 MonoObject *
-mono_load_remote_field_new (MonoObject *this, MonoClass *klass, MonoClassField *field);
+mono_load_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassField *field);
 
 void
 mono_store_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer val);
 
 void
-mono_store_remote_field_new (MonoObject *this, MonoClass *klass, MonoClassField *field, MonoObject *arg);
+mono_store_remote_field_new (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, MonoObject *arg);
 
 void
 mono_method_return_message_restore (MonoMethod *method, gpointer *params, MonoArray *out_args);

diff --git a/mono/metadata/threads.h b/mono/metadata/threads.h
index 6e2cbef1429f19950ae6ca8c720219870d31da4c..faecc11166af6ee6b2f41c3d1e41a7b62f149489 100644 (file)
--- a/mono/metadata/threads.h
+++ b/mono/metadata/threads.h
@@ -52,11 +52,11 @@ extern void mono_thread_create (MonoDomain *domain, gpointer func,
                                       gpointer arg);
 extern MonoThread *mono_thread_attach (MonoDomain *domain);
 
-extern HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoThread *this, MonoObject *start);
-extern void ves_icall_System_Threading_Thread_Thread_free_internal(MonoThread *this, HANDLE thread);
-extern void ves_icall_System_Threading_Thread_Start_internal(MonoThread *this, HANDLE thread);
+extern HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoThread *this_obj, MonoObject *start);
+extern void ves_icall_System_Threading_Thread_Thread_free_internal(MonoThread *this_obj, HANDLE thread);
+extern void ves_icall_System_Threading_Thread_Start_internal(MonoThread *this_obj, HANDLE thread);
 extern void ves_icall_System_Threading_Thread_Sleep_internal(int ms);
-extern gboolean ves_icall_System_Threading_Thread_Join_internal(MonoThread *this, int ms, HANDLE thread);
+extern gboolean ves_icall_System_Threading_Thread_Join_internal(MonoThread *this_obj, int ms, HANDLE thread);
 extern gint32 ves_icall_System_Threading_Thread_GetDomainID (void);
 extern void ves_icall_System_Threading_Thread_SlotHash_store(MonoObject *data);
 extern MonoObject *ves_icall_System_Threading_Thread_SlotHash_lookup(void);
@@ -69,7 +69,7 @@ extern gboolean ves_icall_System_Threading_Events_ResetEvent_internal (HANDLE ha
 
 extern gboolean ves_icall_System_Threading_WaitHandle_WaitAll_internal(MonoArray *mono_handles, gint32 ms, gboolean exitContext);
 extern gint32 ves_icall_System_Threading_WaitHandle_WaitAny_internal(MonoArray *mono_handles, gint32 ms, gboolean exitContext);
-extern gboolean ves_icall_System_Threading_WaitHandle_WaitOne_internal(MonoObject *this, HANDLE handle, gint32 ms, gboolean exitContext);
+extern gboolean ves_icall_System_Threading_WaitHandle_WaitOne_internal(MonoObject *this_obj, HANDLE handle, gint32 ms, gboolean exitContext);
 
 extern gint32 ves_icall_System_Threading_Interlocked_Increment_Int(gint32 *location);
 extern gint64 ves_icall_System_Threading_Interlocked_Increment_Long(gint64 *location);