From: Geoff Norton <grompf@sublimeintervention.com>
Date: Fri, 29 Jan 2010 18:58:53 +0000 (+0000)
Subject: 2010-01-29  Geoff Norton  <gnorton@novell.com>
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7637140b49f66e115c9a95f434ad9621074ebcb8;p=gc

2010-01-29  Geoff Norton  <gnorton@novell.com>

        * include/private/gcconfig.h: Don't define NO_PTHREAD_TRYLOCK on darwin-x86
        Patch from Tom Philpot (tom.philpot@gmail.com)

svn path=/trunk/mono/; revision=150568
---

diff --git a/ChangeLog b/ChangeLog
index 7650d9c3..f5d69bb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-29  Geoff Norton  <gnorton@novell.com>
+
+	* include/private/gcconfig.h: Don't define NO_PTHREAD_TRYLOCK on darwin-x86
+	Patch from Tom Philpot (tom.philpot@gmail.com)
+
 2009-10-25  Zoltan Varga  <vargaz@gmail.com>
 
 	* misc.c (GC_get_suspend_signal): New API function to return the suspend signal
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index aae3755b..860195c8 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -327,9 +327,6 @@
 #    endif
 #    include <unistd.h>
 #    define GETPAGESIZE() getpagesize()
-      /* There seems to be some issues with trylock hanging on darwin. This
-         should be looked into some more */
-#     define NO_PTHREAD_TRYLOCK
 #   elif defined(__arm__)
 #    define ARM
 #    define mach_type_known