Index: abi/include/abi/bool.h
===================================================================
--- abi/include/abi/bool.h	(revision c4049e626273ba323a04efe45158784fbaa8c474)
+++ abi/include/abi/bool.h	(revision bfa86e5eaa3d8c32790e2a385666dac6430fe4fb)
@@ -36,5 +36,7 @@
 #define ABI_BOOL_H_
 
+#ifndef __cplusplus
 #define bool _Bool
+#endif
 
 #endif