# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1220196592 -7200
# Node ID 4b1b0d262c9a5c15431e94af9c9e9319e47a1431
# Parent  394e72cbbb46f8135795fcabe16c96dfc089801f# Parent  1ada9c6865df9d43a3f3781e0cef4c87e5f4cc0b
merge

diff -r 1ada9c6865df -r 4b1b0d262c9a runtime/internal/critical.c
--- a/runtime/internal/critical.c	Sat Aug 30 10:31:04 2008 +0200
+++ b/runtime/internal/critical.c	Sun Aug 31 17:29:52 2008 +0200
@@ -81,7 +81,7 @@
 #include	<stdlib.h>
 #include	<pthread.h>
 
-#if __APPLE__
+#if !linux
 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
diff -r 1ada9c6865df -r 4b1b0d262c9a runtime/internal/monitor.c
--- a/runtime/internal/monitor.c	Sat Aug 30 10:31:04 2008 +0200
+++ b/runtime/internal/monitor.c	Sun Aug 31 17:29:52 2008 +0200
@@ -127,7 +127,7 @@
 
 #if USE_PTHREADS
 
-#if __APPLE__
+#if !linux
 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif