From owner-svn-src-all@FreeBSD.ORG Mon Dec 12 18:43:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A77241065775; Mon, 12 Dec 2011 18:43:24 +0000 (UTC) (envelope-from mdf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 986A98FC0A; Mon, 12 Dec 2011 18:43:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBCIhOoh013537; Mon, 12 Dec 2011 18:43:24 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBCIhOuP013530; Mon, 12 Dec 2011 18:43:24 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201112121843.pBCIhOuP013530@svn.freebsd.org> From: Matthew D Fleming Date: Mon, 12 Dec 2011 18:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228443 - in head/sys: dev/cxgbe dev/drm dev/speaker dev/tws dev/vxge ofed/include/linux X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 18:43:25 -0000 Author: mdf Date: Mon Dec 12 18:43:24 2011 New Revision: 228443 URL: http://svn.freebsd.org/changeset/base/228443 Log: Do not define bool/true/false if the symbols already exist. MFC after: 2 weeks Sponsored by: Isilon Systems, LLC Modified: head/sys/dev/cxgbe/osdep.h head/sys/dev/drm/i915_drv.h head/sys/dev/speaker/spkr.c head/sys/dev/tws/tws.h head/sys/dev/vxge/vxge-osdep.h head/sys/ofed/include/linux/types.h Modified: head/sys/dev/cxgbe/osdep.h ============================================================================== --- head/sys/dev/cxgbe/osdep.h Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/dev/cxgbe/osdep.h Mon Dec 12 18:43:24 2011 (r228443) @@ -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: head/sys/dev/drm/i915_drv.h ============================================================================== --- head/sys/dev/drm/i915_drv.h Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/dev/drm/i915_drv.h Mon Dec 12 18:43:24 2011 (r228443) @@ -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: head/sys/dev/speaker/spkr.c ============================================================================== --- head/sys/dev/speaker/spkr.c Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/dev/speaker/spkr.c Mon Dec 12 18:43:24 2011 (r228443) @@ -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: head/sys/dev/tws/tws.h ============================================================================== --- head/sys/dev/tws/tws.h Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/dev/tws/tws.h Mon Dec 12 18:43:24 2011 (r228443) @@ -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: head/sys/dev/vxge/vxge-osdep.h ============================================================================== --- head/sys/dev/vxge/vxge-osdep.h Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/dev/vxge/vxge-osdep.h Mon Dec 12 18:43:24 2011 (r228443) @@ -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: head/sys/ofed/include/linux/types.h ============================================================================== --- head/sys/ofed/include/linux/types.h Mon Dec 12 18:43:18 2011 (r228442) +++ head/sys/ofed/include/linux/types.h Mon Dec 12 18:43:24 2011 (r228443) @@ -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;