From bdae52f1465743ad96b2261e053ae4967f807557 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 19 Nov 2012 15:02:52 +0000 Subject: Fix compilation error with older versions of GCC Some versions of GCC will error if you define a type twice (even if the definition is the same). The NCR53C8XX SCSI driver defines 'vm_offset_t', this is also defined in vm_types.h and will therefore cause a compilation error depending on the GCC version. * linux/src/drivers/scsi/ncr53c8xx.c [!MACH] (vm_offset_t, vm_size_t): Don't define types. --- linux/src/drivers/scsi/ncr53c8xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linux') diff --git a/linux/src/drivers/scsi/ncr53c8xx.c b/linux/src/drivers/scsi/ncr53c8xx.c index 22aec32..0a58429 100644 --- a/linux/src/drivers/scsi/ncr53c8xx.c +++ b/linux/src/drivers/scsi/ncr53c8xx.c @@ -272,8 +272,10 @@ typedef u32 u_int32; #define u_int unsigned int #define u_long unsigned long +#ifndef MACH typedef u_long vm_offset_t; -//typedef int vm_size_t; +typedef int vm_size_t; +#endif #define bcopy(s, d, n) memcpy((d), (s), (n)) #define bzero(d, n) memset((d), 0, (n)) -- cgit v1.2.3