2007-12-27 Zoltan Varga <vargaz@gmail.com>

	* Thread.cs: Change the type of synch_cs to an IntPtr to be in synch with the
	unmanaged definition.

svn path=/trunk/mcs/; revision=91908

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index 28d97a1886786c7a702a7b9085847778f3497585..d0fbc00ea905262a3d86e29a3611a614676f4adb 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-27  Zoltan Varga  <vargaz@gmail.com>
+
+       * Thread.cs: Change the type of synch_cs to an IntPtr to be in synch with the
+       unmanaged definition.
+
 2007-11-20  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ReaderWriterLock.cs : ... and avoid extra finalizer call.

diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
index a88ebefb0b98f543a2399f7c004a20bee41b896c..590286ce06ef945c208dd3cee4f4392afbf4b818 100644 (file)
--- a/mcs/class/corlib/System.Threading/Thread.cs
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -88,8 +88,7 @@ namespace System.Threading {
                private IntPtr suspend_event;
                private IntPtr suspended_event;
                private IntPtr resume_event;
-               /* Don't lock on synch_cs in managed code, since it can result in deadlocks */
-               private object synch_cs = null;
+               private IntPtr synch_cs;
                private IntPtr serialized_culture_info;
                private int serialized_culture_info_len;
                private IntPtr serialized_ui_culture_info;