Changeset e1a27be in mainline for uspace/lib/c/include/stdbool.h

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/include/stdbool.h (moved) (moved from uspace/lib/posix/include/posix/stdbool.h ) (2 diffs)

uspace/lib/c/include/stdbool.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Zarevucky
+ * Copyright (c) 2006 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libposix
+/** @addtogroup libc
  * @{
  */
-/** @file Boolean type and values.
+/** @file
  */
 
-#ifndef POSIX_STDBOOL_H_
-#define POSIX_STDBOOL_H_
+#ifndef LIBC_BOOL_H_
+#define LIBC_BOOL_H_
 
-#ifdef LIBC_BOOL_H_
+#include <libarch/types.h>
+#include <abi/bool.h>
 
-#if (!defined(POSIX_STDIO_H_)) && \
-    (!defined(POSIX_STDLIB_H_)) && \
-    (!defined(POSIX_STRING_H_))
-        #error "You can't include bool.h and stdbool.h at the same time."
+#define false  0
+#define true   1
+
+#define __bool_true_false_are_defined 1
+
 #endif
 
-#endif /* LIBC_BOOL_H */
-
-#define LIBC_BOOL_H_
-
-#define bool _Bool
-#define true 1
-#define false 0
-#define __bool_true_false_are_defined 1
-
-#endif /* POSIX_STDBOOL_H_ */
+/** @}
+ */