Status: not-sent-upstream

Index: include/dfb_types.h
===================================================================
--- include/dfb_types.h.orig	2005-10-19 02:14:12.000000000 +0300
+++ include/dfb_types.h	2007-06-07 06:29:03.000000000 +0300
@@ -1,21 +1,13 @@
 #ifndef __DFB_TYPES_H__
 #define __DFB_TYPES_H__
 
-#include <sys/types.h>
+#if defined(__linux__)
 
-#ifndef USE_KOS
+#include <asm/types.h>
 
-#define __u8  u_int8_t
-#define __u16 u_int16_t
-#define __u32 u_int32_t
-#define __u64 u_int64_t
+#elif defined(USE_KOS)
 
-#define __s8  int8_t
-#define __s16 int16_t
-#define __s32 int32_t
-#define __s64 int64_t
-
-#else
+#include <sys/types.h>
 
 #define __u8  uint8
 #define __u16 uint16
@@ -27,6 +19,20 @@
 #define __s32 sint32
 #define __s64 sint64
 
+#else
+
+#include <stdint.h>
+
+#define __u8  uint8_t
+#define __u16 uint16_t
+#define __u32 uint32_t
+#define __u64 uint64_t
+
+#define __s8  int8_t
+#define __s16 int16_t
+#define __s32 int32_t
+#define __s64 int64_t
+
 #endif
 
 #endif
Index: gfxdrivers/i830/i830.h
===================================================================
--- gfxdrivers/i830/i830.h.orig	2007-06-07 06:29:38.000000000 +0300
+++ gfxdrivers/i830/i830.h	2007-06-07 06:30:03.000000000 +0300
@@ -28,6 +28,8 @@
 #define __I830_H__
 
 #include <dfb_types.h>
+#include <stddef.h>
+#include <sys/types.h>
 #include <linux/agpgart.h>
 
 #include <core/gfxcard.h>