aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/crystalhd
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-01-07 18:35:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:41 -0800
commit88d43000098017d93d9bb2f88d33950e6c7a6bf4 (patch)
treef14c2dd62f8b2604c2ce3e4ccf60ae9b5b797086 /drivers/staging/crystalhd
parent8a8e29752dfdba014b866d3c587d3409e57263dd (diff)
staging: crystalhd: add missing fixes for userspace lib build
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>
Diffstat (limited to 'drivers/staging/crystalhd')
-rw-r--r--drivers/staging/crystalhd/bc_dts_types.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/crystalhd/bc_dts_types.h b/drivers/staging/crystalhd/bc_dts_types.h
index e073d7450c1..ac0c8171738 100644
--- a/drivers/staging/crystalhd/bc_dts_types.h
+++ b/drivers/staging/crystalhd/bc_dts_types.h
@@ -25,6 +25,10 @@
#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;