2010-07-13 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* mono-semaphore.h:
	* mono-semaphore.c: use io-layer wait functions in OSX.

svn path=/trunk/mono/; revision=160310

diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
index 198e61b611f14e9c4e5ead5170706d07733f85d3..e369d5a4c7e02353bf59524cd7f94cf8b5461bb1 100644 (file)
--- a/mono/utils/ChangeLog
+++ b/mono/utils/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * mono-semaphore.h:
+       * mono-semaphore.c: use io-layer wait functions in OSX.
+
 2010-07-02  Michael Hutchinson  <mhutchinson@novell.com>
 
        * mono-compiler.h: Add MONO_THREAD_VAR_OFFSET macro for s390x.

diff --git a/mono/utils/mono-semaphore.c b/mono/utils/mono-semaphore.c
index 4aefaacd895b1285fe9d18d30cec7691e40ea31f..7b3adf3f8bde7ede3bd0ce10a9ac8ce4e51de90d 100644 (file)
--- a/mono/utils/mono-semaphore.c
+++ b/mono/utils/mono-semaphore.c
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #endif
 
-#if (defined(HAVE_SEMAPHORE_H) || defined(USE_MACH_SEMA))
+#if (defined(HAVE_SEMAPHORE_H) || defined(USE_MACH_SEMA)) && !defined(__APPLE__)
 /* sem_* or semaphore_* functions in use */
 #  ifdef USE_MACH_SEMA
 #    define TIMESPEC mach_timespec_t

diff --git a/mono/utils/mono-semaphore.h b/mono/utils/mono-semaphore.h
index d6be806efe5a2b14a52129a46b72745490d5413a..305ac25e53dcdb7118c86a9011846c52d58265fa 100644 (file)
--- a/mono/utils/mono-semaphore.h
+++ b/mono/utils/mono-semaphore.h
@@ -17,7 +17,7 @@
 #endif
 #include <mono/io-layer/io-layer.h>
 
-#if defined (HAVE_SEMAPHORE_H) || defined (USE_MACH_SEMA)
+#if (defined(HAVE_SEMAPHORE_H) || defined(USE_MACH_SEMA)) && !defined(__APPLE__)
 #  define MONO_HAS_SEMAPHORES
 
 #  if defined (USE_MACH_SEMA)