diff options
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 |
4 files changed, 9 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 8e293be4d6b5..2e6f3514d79a 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 ---------------- */ |