summaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorTomas Wilhelmsson <[email protected]>2009-02-23 08:11:29 -0700
committerBrian Paul <[email protected]>2009-02-23 08:11:29 -0700
commit41172c04306098ab9ecba8b48d7be47c3911a662 (patch)
treea324979d3849b9376a603aed930fb25cee9d45b0 /src/mesa/glapi
parentd265706cd3849679e543797b4ad4edf463cd4586 (diff)
mesa: fixes for building on Haiku
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/glthread.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h
index 4da31e5738e..dfe09a9d59f 100644
--- a/src/mesa/glapi/glthread.h
+++ b/src/mesa/glapi/glthread.h
@@ -265,9 +265,21 @@ typedef xmutex_rec _glthread_Mutex;
*/
#ifdef BEOS_THREADS
+/* Problem with OS.h and this file on haiku */
+#ifndef __HAIKU__
#include <kernel/OS.h>
+#endif
+
#include <support/TLS.h>
+/* The only two typedefs required here
+ * this is cause of the OS.h problem
+ */
+#ifdef __HAIKU__
+typedef int32 thread_id;
+typedef int32 sem_id;
+#endif
+
typedef struct {
int32 key;
int initMagic;