Author: mdf
Date: Sat Dec 31 20:42:34 2011
New Revision: 229157
URL: http://svn.freebsd.org/changeset/base/229157
Log:
MFC r228443:
Do not define bool/true/false if the symbols already exist.
Modified:
stable/9/sys/dev/cxgbe/osdep.h
stable/9/sys/dev/drm/i915_drv.h
stable/9/sys/dev/speaker/spkr.c
stable/9/sys/dev/tws/tws.h
stable/9/sys/dev/vxge/vxge-osdep.h
stable/9/sys/ofed/include/linux/types.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/dev/cxgbe/osdep.h
==============================================================================
--- stable/9/sys/dev/cxgbe/osdep.h Sat Dec 31 20:27:36 2011
(r229156)
+++ stable/9/sys/dev/cxgbe/osdep.h Sat Dec 31 20:42:34 2011
(r229157)
@@ -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)
Modified: stable/9/sys/dev/drm/i915_drv.h
==============================================================================
--- stable/9/sys/dev/drm/i915_drv.h Sat Dec 31 20:27:36 2011
(r229156)
+++ stable/9/sys/dev/drm/i915_drv.h Sat Dec 31 20:42:34 2011
(r229157)
@@ -560,7 +560,7 @@ extern void opregion_enable_asle(struct
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
Modified: stable/9/sys/dev/speaker/spkr.c
==============================================================================
--- stable/9/sys/dev/speaker/spkr.c Sat Dec 31 20:27:36 2011
(r229156)
+++ stable/9/sys/dev/speaker/spkr.c Sat Dec 31 20:42:34 2011
(r229157)
@@ -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
Modified: stable/9/sys/dev/tws/tws.h
==============================================================================
--- stable/9/sys/dev/tws/tws.h Sat Dec 31 20:27:36 2011 (r229156)
+++ stable/9/sys/dev/tws/tws.h Sat Dec 31 20:42:34 2011 (r229157)
@@ -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 ---------------- */
Modified: stable/9/sys/dev/vxge/vxge-osdep.h
==============================================================================
--- stable/9/sys/dev/vxge/vxge-osdep.h Sat Dec 31 20:27:36 2011
(r229156)
+++ stable/9/sys/dev/vxge/vxge-osdep.h Sat Dec 31 20:42:34 2011
(r229157)
@@ -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;
Modified: stable/9/sys/ofed/include/linux/types.h
==============================================================================
--- stable/9/sys/ofed/include/linux/types.h Sat Dec 31 20:27:36 2011
(r229156)
+++ stable/9/sys/ofed/include/linux/types.h Sat Dec 31 20:42:34 2011
(r229157)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
