From owner-svn-src-head@FreeBSD.ORG Mon Dec 12 18:44:17 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A270A1065673; Mon, 12 Dec 2011 18:44:17 +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 773F28FC26; Mon, 12 Dec 2011 18:44:17 +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 pBCIiHbh013620; Mon, 12 Dec 2011 18:44:17 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBCIiHel013616; Mon, 12 Dec 2011 18:44:17 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201112121844.pBCIiHel013616@svn.freebsd.org> From: Matthew D Fleming Date: Mon, 12 Dec 2011 18:44:17 +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: r228444 - in head: include sys/sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2011 18:44:17 -0000 Author: mdf Date: Mon Dec 12 18:44:17 2011 New Revision: 228444 URL: http://svn.freebsd.org/changeset/base/228444 Log: - Define true and false in sys/types.h for _KERNEL consumers, and typedef bool. Due to macro expansion it seemed better to use a typedef for kernel consumers (specifically ofed won't compile without more changes if a define is used). - should also not re-define bool/true/false if they are defined by . It would probably be a programming error to define _KERNEL for user-space code, but downstream consumers like Isilon have already been including in kernel sources, and this protects that usage. - sizeof(_Bool) is not necessarily the same as sizeof(int), so kernel modules should be rebuild with this change. Bump __FreeBSD_version. MFC after: 2 weeks Sponsored by: Isilon Systems, LLC Modified: head/include/stdbool.h head/sys/sys/param.h head/sys/sys/types.h Modified: head/include/stdbool.h ============================================================================== --- head/include/stdbool.h Mon Dec 12 18:43:24 2011 (r228443) +++ head/include/stdbool.h Mon Dec 12 18:44:17 2011 (r228444) @@ -29,6 +29,7 @@ #ifndef _STDBOOL_H_ #define _STDBOOL_H_ +#ifndef __bool_true_false_are_defined #define __bool_true_false_are_defined 1 #ifndef __cplusplus @@ -42,5 +43,6 @@ typedef int _Bool; #endif #endif /* !__cplusplus */ +#endif /* __bool_true_false_are_defined */ #endif /* !_STDBOOL_H_ */ Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Mon Dec 12 18:43:24 2011 (r228443) +++ head/sys/sys/param.h Mon Dec 12 18:44:17 2011 (r228444) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1000001 /* Master, propagated to newvers */ +#define __FreeBSD_version 1000002 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: head/sys/sys/types.h ============================================================================== --- head/sys/sys/types.h Mon Dec 12 18:43:24 2011 (r228443) +++ head/sys/sys/types.h Mon Dec 12 18:44:17 2011 (r228444) @@ -261,6 +261,16 @@ typedef __uint64_t uoff_t; typedef char vm_memattr_t; /* memory attribute codes */ typedef struct vm_page *vm_page_t; +#if !defined(__bool_true_false_are_defined) && !defined(__cplusplus) +#define __bool_true_false_are_defined 1 +#define false 0 +#define true 1 +#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER) +typedef int _Bool; +#endif +typedef _Bool bool; +#endif /* !__bool_true_false_are_defined && !__cplusplus */ + #define offsetof(type, field) __offsetof(type, field) #endif /* !_KERNEL */