diff options
| author | Matthew Leach <matthew@mattleach.net> | 2012-11-19 15:02:52 +0000 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-11-19 16:28:16 +0100 |
| commit | bdae52f1465743ad96b2261e053ae4967f807557 (patch) | |
| tree | ca01f4ad9deeb565ecd0623bdbc6cffa825b4244 | |
| parent | 45c4266eceeb35d20a0c74b4cd85510a0e3bf385 (diff) | |
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.
| -rw-r--r-- | linux/src/drivers/scsi/ncr53c8xx.c | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |