From 1de1bbba6d035038f973ba1983f28d1304a35e26 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 17 Aug 2009 20:49:16 -0700 Subject: [PATCH] PSARC 2009/429 sys/stdbool.h 6870093 RFE: C99 should be visible for kernel modules Contributed by Roland Mainz --- usr/src/head/stdbool.h | 100 +++++++++-------------------- usr/src/pkgdefs/SUNWhea/prototype_com | 1 + usr/src/uts/common/sys/Makefile | 1 + usr/src/{head => uts/common/sys}/stdbool.h | 10 ++- 4 files changed, 38 insertions(+), 74 deletions(-) rewrite usr/src/head/stdbool.h (61%) copy usr/src/{head => uts/common/sys}/stdbool.h (93%) diff --git a/usr/src/head/stdbool.h b/usr/src/head/stdbool.h dissimilarity index 61% index 2d5a08c941..f199b81902 100644 --- a/usr/src/head/stdbool.h +++ b/usr/src/head/stdbool.h @@ -1,68 +1,32 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ifndef _STDBOOL_H -#define _STDBOOL_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * This header is included for alignment with the ISO/IEC 9899:1999 standard. - * The contents are only visible when using a c99 compiler. In the case of - * the Sun compiler, some C99 features, including the _Bool built-in type, - * are provided in the default compilation mode. This is a subset of what - * is provided when __STDC_VERSION__ is 199901; hence the contents of this - * header are made visible when either __STDC_VERSION__ >= 199901 (_STDC_C99 - * as defined in sys/feature_tests.h) or if __C99FEATURES__ (a Sun compiler - * built-in) is defined. Likewise for GNU C, support for C99 features, - * including this header, is provided in versions 3.0 or greater. In no - * case should the contents of this header be visible in a C++ build - * environment. - * - * Note that the ability to undefine and redefine the macros bool, - * true, and false is an obsolescent feature which may be withdrawn - * in a future version of the standards specifications. - */ - -#include - -#ifndef __cplusplus -#if defined(_STDC_C99) || defined(__C99FEATURES__) || __GNUC__ >= 3 - -#undef bool -#undef true -#undef false - -#define bool _Bool -#define true 1 -#define false 0 - -#define __bool_true_false_are_defined 1 - -#endif /* defined(_STDC_C99) || defined(__C99FEATURES__) || __GNUC__ >= 3 */ -#endif /* __cplusplus */ - -#endif /* _STDBOOL_H */ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _STDBOOL_H +#define _STDBOOL_H + +#include + +#endif /* _STDBOOL_H */ diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com index d2940881c7..b7689d5aa5 100644 --- a/usr/src/pkgdefs/SUNWhea/prototype_com +++ b/usr/src/pkgdefs/SUNWhea/prototype_com @@ -1253,6 +1253,7 @@ f none usr/include/sys/stat.h 644 root bin f none usr/include/sys/stat_impl.h 644 root bin f none usr/include/sys/statfs.h 644 root bin f none usr/include/sys/statvfs.h 644 root bin +f none usr/include/sys/stdbool.h 644 root bin f none usr/include/sys/stdint.h 644 root bin f none usr/include/sys/stermio.h 644 root bin f none usr/include/sys/stream.h 644 root bin diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 808cc8e26d..147467bea0 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -505,6 +505,7 @@ CHKHDRS= \ stat.h \ statfs.h \ statvfs.h \ + stdbool.h \ stdint.h \ stermio.h \ stmf.h \ diff --git a/usr/src/head/stdbool.h b/usr/src/uts/common/sys/stdbool.h similarity index 93% copy from usr/src/head/stdbool.h copy to usr/src/uts/common/sys/stdbool.h index 2d5a08c941..6b3227c3d7 100644 --- a/usr/src/head/stdbool.h +++ b/usr/src/uts/common/sys/stdbool.h @@ -20,14 +20,12 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#ifndef _STDBOOL_H -#define _STDBOOL_H - -#pragma ident "%Z%%M% %I% %E% SMI" +#ifndef _SYS_STDBOOL_H +#define _SYS_STDBOOL_H /* * This header is included for alignment with the ISO/IEC 9899:1999 standard. @@ -65,4 +63,4 @@ #endif /* defined(_STDC_C99) || defined(__C99FEATURES__) || __GNUC__ >= 3 */ #endif /* __cplusplus */ -#endif /* _STDBOOL_H */ +#endif /* !_SYS_STDBOOL_H */ -- 2.11.4.GIT