summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga
diff options
context:
space:
mode:
authorAlexander von Gluck <[email protected]>2012-01-22 12:42:24 -0600
committerBrian Paul <[email protected]>2012-01-24 11:00:41 -0700
commit32876a452f368529392619b1d2552594317e8420 (patch)
tree77a222fc741c44ee445142d848303fe5350525a7 /src/gallium/drivers/svga
parent1550b0668e8914f12ed314d347f59c89ba42c20c (diff)
svga: fix typedef conflicts on Haiku
NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/svga')
-rw-r--r--src/gallium/drivers/svga/include/svga_types.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/svga/include/svga_types.h b/src/gallium/drivers/svga/include/svga_types.h
index 7fd9bab03a5..7a99f3417f9 100644
--- a/src/gallium/drivers/svga/include/svga_types.h
+++ b/src/gallium/drivers/svga/include/svga_types.h
@@ -28,6 +28,7 @@
#include "pipe/p_compiler.h"
+#ifndef __HAIKU__
typedef int64_t int64;
typedef uint64_t uint64;
@@ -39,6 +40,9 @@ typedef uint16_t uint16;
typedef int8_t int8;
typedef uint8_t uint8;
+#else
+#include <OS.h>
+#endif /* HAIKU */
typedef uint8_t Bool;