# HG changeset patch # User Christian Kamm # Date 1220085064 -7200 # Node ID 1ada9c6865df9d43a3f3781e0cef4c87e5f4cc0b # Parent fbc454d4ce80b6915bb0924843e17b3d3fadf6af# Parent d4e95db0e62bb2d743fa1a25284e89f0a5e37609 Automated merge with http://hg.dsource.org/projects/llvmdc diff -r d4e95db0e62b -r 1ada9c6865df runtime/internal/critical.c --- a/runtime/internal/critical.c Sat Aug 30 10:30:57 2008 +0200 +++ b/runtime/internal/critical.c Sat Aug 30 10:31:04 2008 +0200 @@ -81,7 +81,7 @@ #include #include -#ifndef HAVE_PTHREAD_MUTEX_RECURSIVE +#if __APPLE__ #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #endif diff -r d4e95db0e62b -r 1ada9c6865df runtime/internal/monitor.c --- a/runtime/internal/monitor.c Sat Aug 30 10:30:57 2008 +0200 +++ b/runtime/internal/monitor.c Sat Aug 30 10:31:04 2008 +0200 @@ -127,7 +127,7 @@ #if USE_PTHREADS -#ifndef HAVE_PTHREAD_MUTEX_RECURSIVE +#if __APPLE__ #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #endif