Mesa (master): svga: fix typedef conflicts on Haiku

[Brian Paul]

Module: Mesa
Branch: master
Commit: 32876a452f368529392619b1d2552594317e8420
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32876a452f368529392619b1d2552594317e8420

Author: Alexander von Gluck <kallisti5 at unixzen.com>
Date:   Sun Jan 22 12:42:24 2012 -0600

svga: fix typedef conflicts on Haiku

NOTE: This is a candidate for the 8.0 branch.

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

---

 src/gallium/drivers/svga/include/svga_types.h |    4 ++++
 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 7fd9bab..7a99f34 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;