diff options
author | mdf <mdf@FreeBSD.org> | 2011-12-12 18:43:24 +0000 |
---|---|---|
committer | mdf <mdf@FreeBSD.org> | 2011-12-12 18:43:24 +0000 |
commit | 20fbb4d01304ebe013c75e1a2ac638689ce4e9ba (patch) | |
tree | a27d87407eb9eb2b783545e6822eca1cb5274b39 /sys/dev | |
parent | 1fdb5a1e7a54aeb6a4b6acd25791d1e2103c160d (diff) | |
download | FreeBSD-src-20fbb4d01304ebe013c75e1a2ac638689ce4e9ba.zip FreeBSD-src-20fbb4d01304ebe013c75e1a2ac638689ce4e9ba.tar.gz |
Do not define bool/true/false if the symbols already exist.
MFC after: 2 weeks
Sponsored by: Isilon Systems, LLC
Diffstat (limited to 'sys/dev')
-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 |
5 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/cxgbe/osdep.h b/sys/dev/cxgbe/osdep.h index bde1eb4..85a8206 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 4ae5e5c..3896732 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 2d52519..94d4792 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 cf9f727..6d0f6ad 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 cc1dbd6..f358c91 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; |