summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2015-07-29 00:10:25 +0000
committerchristos <christos@NetBSD.org>2015-07-29 00:10:25 +0000
commit12e060dcf304bdbdc7aaa95dbf8c0779ed8e1703 (patch)
tree43c80c16221db7f9caf8e5011d0d6a927f91747c /include
parentb8153cee8a0d73daf60836d8651ab7b2a4445c30 (diff)
move stdbool.h to sys, reuire pool.h to include <sys/stdbool.h> for bool,
centralize definitions of bool, true, false, to <sys/stdbool.h>
Diffstat (limited to 'include')
-rw-r--r--include/Makefile4
-rw-r--r--include/stdbool.h45
2 files changed, 2 insertions, 47 deletions
diff --git a/include/Makefile b/include/Makefile
index 0f94a2feefa..039e3f056d4 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2013/12/11 01:24:08 joerg Exp $
+# $NetBSD: Makefile,v 1.141 2015/07/29 00:10:26 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -18,7 +18,7 @@ INCS= a.out.h aio.h ar.h assert.h atomic.h \
ndbm.h netconfig.h netdb.h netgroup.h nlist.h nl_types.h nsswitch.h \
paths.h pwd.h quota.h randomid.h ranlib.h re_comp.h regex.h regexp.h \
resolv.h res_update.h rmt.h sched.h search.h semaphore.h setjmp.h \
- string.h sgtty.h signal.h spawn.h stab.h stdbool.h stddef.h stdio.h \
+ string.h sgtty.h signal.h spawn.h stab.h stddef.h stdio.h \
stdlib.h strings.h stringlist.h struct.h sysexits.h tar.h time.h \
ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \
utmpx.h uuid.h vis.h wchar.h wctype.h wordexp.h
diff --git a/include/stdbool.h b/include/stdbool.h
deleted file mode 100644
index 966416bdf4a..00000000000
--- a/include/stdbool.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $NetBSD: stdbool.h,v 1.5 2013/04/26 17:41:34 joerg Exp $ */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _STDBOOL_H_
-#define _STDBOOL_H_
-
-#ifndef __cplusplus
-#define bool _Bool
-
-#define true 1
-#define false 0
-
-#endif /* __cplusplus */
-
-#define __bool_true_false_are_defined 1
-
-#endif /* _STDBOOL_H_ */