From 32876a452f368529392619b1d2552594317e8420 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck Date: Sun, 22 Jan 2012 12:42:24 -0600 Subject: [PATCH] svga: fix typedef conflicts on Haiku NOTE: This is a candidate for the 8.0 branch. Signed-off-by: Brian Paul --- src/gallium/drivers/svga/include/svga_types.h | 4 ++++ 1 file changed, 4 insertions(+) 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 +#endif /* HAIKU */ typedef uint8_t Bool; -- 2.7.4