From 108cd49471714a9e8ac5747b2d18a5fd610fe734 Mon Sep 17 00:00:00 2001 From: Matthew D Fleming Date: Mon, 12 Dec 2011 18:44:17 +0000 Subject: [PATCH] - 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 --- include/stdbool.h | 2 ++ sys/sys/param.h | 2 +- sys/sys/types.h | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/stdbool.h b/include/stdbool.h index c0d6459cc029..099549cbfbe9 100644 --- a/include/stdbool.h +++ b/include/stdbool.h @@ -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_ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index 87eba11e0e8f..1ce8e353d5a8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -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, diff --git a/sys/sys/types.h b/sys/sys/types.h index 1b994d31a01d..43c29d6cc995 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -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 */