From: Alexander von Gluck <kallisti5@unixzen.com>
Date: Sun, 22 Jan 2012 18:42:24 +0000 (-0600)
Subject: svga: fix typedef conflicts on Haiku
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32876a452f368529392619b1d2552594317e8420;p=mesa.git

svga: fix typedef conflicts on Haiku

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
---

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;