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 7650d9c3ea30fbd1d9181b47e53fc7e76ebf9a32..f5d69bb3e47e81035a1add06f7e7c92f15da441a 100644 (file)
--- 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 aae3755b0d15d8b842aa7b014119228cb2d900c0..860195c857f07c7aaf9ed6f6c5c43cccf3807794 100644 (file)
--- 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