changeset 564:4b1b0d262c9a

merge
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 31 Aug 2008 17:29:52 +0200
parents 394e72cbbb46 (diff) 1ada9c6865df (current diff)
children 3c07287765bc
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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