staging: crystalhd: add missing fixes for userspace lib build
authorJarod Wilson <jarod@redhat.com>
Thu, 7 Jan 2010 23:35:58 +0000 (18:35 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:41 +0000 (16:42 -0800)
I somehow managed to not actually include these two fixes in the submission
that was committed to the staging tree. libcrystalhd should eventually be
built against the kernel-provided header, and needs the stdint.h include. The
VOID bit is to keep things in sync with the Mac OS X driver and library that
Scott Davilla is also working on.

Signed-off-by: Scott Davilla <davilla@4pi.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/crystalhd/bc_dts_types.h

index e073d74..ac0c817 100644 (file)
 #ifndef _BC_DTS_TYPES_H_
 #define _BC_DTS_TYPES_H_
 
+#ifdef __LINUX_USER__  // Don't include these for KERNEL..
+#include <stdint.h>
+#endif
+
 #if defined(_WIN64) || defined(_WIN32)
 typedef uint32_t               U32;
 typedef int32_t                        S32;
@@ -62,7 +66,9 @@ typedef int   BOOL;
 typedef uint32_t       ULONG;
 typedef int32_t                LONG;
 typedef void           *HANDLE;
+#ifndef VOID
 typedef void           VOID;
+#endif
 typedef void           *LPVOID;
 typedef uint32_t       DWORD;
 typedef uint32_t       UINT32;