summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander von Gluck <kallisti5@unixzen.com>2011-12-27 09:02:59 -0700
committerBrian Paul <brianp@vmware.com>2011-12-27 09:16:30 -0700
commit9e4c8ce3bc2c68d6397de1b48ce300ee6826e759 (patch)
treec57b99c448a4432c31794f6d833b46ce97dbbab7
parent157566860dee7ef4560f0f0a0a09f86b5973ed19 (diff)
downloadexternal_mesa3d-9e4c8ce3bc2c68d6397de1b48ce300ee6826e759.zip
external_mesa3d-9e4c8ce3bc2c68d6397de1b48ce300ee6826e759.tar.gz
external_mesa3d-9e4c8ce3bc2c68d6397de1b48ce300ee6826e759.tar.bz2
gallium: use Mesa pthread_barrier_t on Haiku, as it is incomplete under Haiku
Reviewed-by: Brian Paul <brianp@vmare.com> Signed-off-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/gallium/auxiliary/os/os_thread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
index d830129..3e1c273 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -314,7 +314,7 @@ typedef int64_t pipe_condvar;
* pipe_barrier
*/
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)) && !defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)) && !defined(PIPE_OS_ANDROID)
typedef pthread_barrier_t pipe_barrier;