Changeset 2be40c81 in mainline

Timestamp:

2018-07-05T21:41:20Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

7ea7605d

Parents:

d350175

git-author:

Dzejrou <dzejrou@…> (2018-03-30 12:24:48)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:20)

Message:

cpp+c: bool is now defined as _Bool only in C mode

Files:

• abi/include/abi/bool.h (modified) (1 diff)
• uspace/lib/cpp/include/internal/common.hpp (modified) (1 diff)

abi/include/abi/bool.h

@@ -36 +36 @@
 #define ABI_BOOL_H_
 
+#ifndef __cplusplus
 #define bool _Bool
+#endif
 
 #endif

uspace/lib/cpp/include/internal/common.hpp

@@ -1 +1 @@
 #ifndef LIBCPP_INTERNAL_COMMON
 #define LIBCPP_INTERNAL_COMMON
-
-/**
- * G++ is will not properly include libc
- * headers without this define.
- */
-#define _Bool bool
 
 /**