From c04cfc2545b3f2dc3f5ea095587d18954211fb3a Mon Sep 17 00:00:00 2001
From: Nikolaos Strikos <strikosn@gmail.com>
Date: Sat, 11 Apr 2020 13:30:19 +0200
Subject: [PATCH] ble_mesh: Do not #define bool when compiling in C++

---
 components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h
index 5a189630cd..8af8b60754 100644
--- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h
+++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_types.h
@@ -28,6 +28,7 @@ typedef unsigned long long  u64_t;
 
 typedef int         bt_mesh_atomic_t;
 
+#ifndef __cplusplus
 #ifndef bool
 #define bool        int8_t
 #endif
@@ -39,6 +40,7 @@ typedef int         bt_mesh_atomic_t;
 #ifndef true
 #define true        1
 #endif
+#endif
 
 #ifndef PRIu64
 #define PRIu64      "llu"