svga: fix typedef conflicts on Haiku
authorAlexander von Gluck <kallisti5@unixzen.com>
Sun, 22 Jan 2012 18:42:24 +0000 (12:42 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 24 Jan 2012 18:00:41 +0000 (11:00 -0700)
NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Brian Paul <brianp@vmware.com>
src/gallium/drivers/svga/include/svga_types.h

index 7fd9bab03a5840bc355a3e4714244aa7dc1d52db..7a99f3417f91ebc801b99e4f0b77e8e5911a2cc3 100644 (file)
@@ -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;