diff options
author | Matthew D Fleming <mdf@FreeBSD.org> | 2011-12-12 18:43:24 +0000 |
---|---|---|
committer | Matthew D Fleming <mdf@FreeBSD.org> | 2011-12-12 18:43:24 +0000 |
commit | 103af58f59c0cb69f1872cbebeb4213d4020e4b9 (patch) | |
tree | a27d87407eb9eb2b783545e6822eca1cb5274b39 | |
parent | e5587e2e031d8fe6255bf3c4eaff74c23fb62dc3 (diff) | |
download | src-103af58f59c0cb69f1872cbebeb4213d4020e4b9.tar.gz src-103af58f59c0cb69f1872cbebeb4213d4020e4b9.zip |
Do not define bool/true/false if the symbols already exist.
MFC after: 2 weeks
Sponsored by: Isilon Systems, LLC
Notes
Notes:
svn path=/head/; revision=228443
-rw-r--r-- | sys/dev/cxgbe/osdep.h | 2 | ||||
-rw-r--r-- | sys/dev/drm/i915_drv.h | 2 | ||||
-rw-r--r-- | sys/dev/speaker/spkr.c | 2 | ||||
-rw-r--r-- | sys/dev/tws/tws.h | 4 | ||||
-rw-r--r-- | sys/dev/vxge/vxge-osdep.h | 2 | ||||
-rw-r--r-- | sys/ofed/include/linux/types.h | 2 |
6 files changed, 13 insertions, 1 deletions
diff --git a/sys/dev/cxgbe/osdep.h b/sys/dev/cxgbe/osdep.h index bde1eb4afc76..85a8206ff8af 100644 --- a/sys/dev/cxgbe/osdep.h +++ b/sys/dev/cxgbe/osdep.h @@ -70,9 +70,11 @@ typedef uint64_t __be64; #error "Must set BYTE_ORDER" #endif +#ifndef __bool_true_false_are_defined typedef boolean_t bool; #define false FALSE #define true TRUE +#endif #define mdelay(x) DELAY((x) * 1000) #define udelay(x) DELAY(x) diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h index 4ae5e5caae51..3896732b32ec 100644 --- a/sys/dev/drm/i915_drv.h +++ b/sys/dev/drm/i915_drv.h @@ -560,7 +560,7 @@ extern void opregion_enable_asle(struct drm_device *dev); LOCK_TEST_WITH_RETURN(dev, file_priv); \ } while (0) -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined) typedef boolean_t bool; #endif diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 2d525197bf90..94d479267337 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -130,7 +130,9 @@ rest(int centisecs) * except possibly at physical block boundaries. */ +#ifndef __bool_true_false_are_defined typedef int bool; +#endif #define TRUE 1 #define FALSE 0 diff --git a/sys/dev/tws/tws.h b/sys/dev/tws/tws.h index cf9f7275f523..6d0f6ad01332 100644 --- a/sys/dev/tws/tws.h +++ b/sys/dev/tws/tws.h @@ -205,7 +205,11 @@ struct tws_init_connect_info { /* ------------ boolean types ------------------- */ +#ifndef __bool_true_false_are_defined typedef enum _boolean { false, true } boolean; +#else +#define boolean bool +#endif enum err { SUCCESS, FAILURE }; /* ----------- per instance data ---------------- */ diff --git a/sys/dev/vxge/vxge-osdep.h b/sys/dev/vxge/vxge-osdep.h index cc1dbd62a718..f358c91c65dc 100644 --- a/sys/dev/vxge/vxge-osdep.h +++ b/sys/dev/vxge/vxge-osdep.h @@ -161,7 +161,9 @@ typedef uint16_t u16; typedef int32_t s32; typedef uint32_t u32; typedef unsigned long long int u64; +#ifndef __bool_true_false_are_defined typedef boolean_t bool; +#endif typedef bus_addr_t dma_addr_t; typedef struct mtx spinlock_t; typedef struct resource *pci_irq_h; diff --git a/sys/ofed/include/linux/types.h b/sys/ofed/include/linux/types.h index 496d6f98a801..331c8b6a5503 100644 --- a/sys/ofed/include/linux/types.h +++ b/sys/ofed/include/linux/types.h @@ -39,9 +39,11 @@ typedef __u32 __le32; typedef __u32 __be32; typedef __u64 __le64; typedef __u64 __be64; +#ifndef __bool_true_false_are_defined typedef _Bool bool; #define true TRUE #define false FALSE +#endif typedef unsigned long kernel_ulong_t; typedef unsigned int uint; |