2010-07-01 Zoltan Varga <vargaz@gmail.com>

* filewatcher.h filewatcher.h decimal.c threads-types.h: Applied patch from Elijah Taylor (elijahtaylor@google.com). Fix some definitions to match their declarations and vice-versa. svn path=/trunk/mono/; revision=159774
mono · Jul 1, 2010 · d93d002 · d93d002
1 parent 8543ba4
commit d93d002
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-01  Zoltan Varga  <vargaz@gmail.com>
+
+	* filewatcher.h filewatcher.h decimal.c threads-types.h: Applied patch
+	from Elijah Taylor (elijahtaylor@google.com). Fix some definitions to
+	match their declarations and vice-versa.
+
 
 Wed Jun 30 12:08:36 CEST 2010 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/decimal.h b/mono/metadata/decimal.h
@@ -44,6 +44,6 @@ double mono_decimal2double(/*[In]*/decimal_repr* pA) MONO_INTERNAL;
 gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 texp) MONO_INTERNAL;
 
 gint32 mono_string2decimal(/*[Out]*/decimal_repr* pA, /*[In]*/MonoString* s, gint32 decrDecimal, gint32 sign) MONO_INTERNAL;
-gint32 mono_decimal2string(/*[In]*/decimal_repr* pA, int digits, int decimals,
+gint32 mono_decimal2string(/*[In]*/decimal_repr* pA, gint32 digits, gint32 decimals,
 			 /*[Out]*/MonoArray* pArray, gint32 bufSize, gint32* pDecPos, gint32* pSign) MONO_INTERNAL;
 
diff --git a/mono/metadata/filewatcher.c b/mono/metadata/filewatcher.c
@@ -155,7 +155,7 @@ int ves_icall_System_IO_InotifyWatcher_AddWatch (int fd, MonoString *directory,
 	return -1;
 }
 
-int ves_icall_System_IO_InotifyWatcher_RemoveWatch (int fd, int watch_descriptor)
+int ves_icall_System_IO_InotifyWatcher_RemoveWatch (int fd, gint32 watch_descriptor)
 {
 	return -1;
 }

diff --git a/mono/metadata/filewatcher.h b/mono/metadata/filewatcher.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-gboolean ves_icall_System_IO_FSW_SupportsFSW (void) MONO_INTERNAL;
+gint ves_icall_System_IO_FSW_SupportsFSW (void) MONO_INTERNAL;
 
 gboolean ves_icall_System_IO_FAMW_InternalFAMNextEvent (gpointer conn,
 							MonoString **filename,

diff --git a/mono/metadata/threads-types.h b/mono/metadata/threads-types.h
@@ -61,7 +61,7 @@ MonoInternalThread* mono_thread_create_internal (MonoDomain *domain, gpointer fu
 void ves_icall_System_Threading_Thread_ConstructInternalThread (MonoThread *this) MONO_INTERNAL;
 HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoThread *this_obj, MonoObject *start) MONO_INTERNAL;
 void ves_icall_System_Threading_InternalThread_Thread_free_internal(MonoInternalThread *this_obj, HANDLE thread) MONO_INTERNAL;
-void ves_icall_System_Threading_Thread_Sleep_internal(int ms) MONO_INTERNAL;
+void ves_icall_System_Threading_Thread_Sleep_internal(gint32 ms) MONO_INTERNAL;
 gboolean ves_icall_System_Threading_Thread_Join_internal(MonoInternalThread *this_obj, int ms, HANDLE thread) MONO_INTERNAL;
 gint32 ves_icall_System_Threading_Thread_GetDomainID (void) MONO_INTERNAL;
 MonoString* ves_icall_System_Threading_Thread_GetName_internal (MonoInternalThread *this_obj) MONO_INTERNAL;