From d2bcb5c7ff517fdfd347eda209547d2a05160863 Mon Sep 17 00:00:00 2001 From: lly Date: Mon, 11 May 2020 17:05:06 +0800 Subject: [PATCH] ble_mesh: A specific fix for compile warning in idf4.0 Compared with the latest idf, idf4.0 defines BIT(nr) in the "esp_bit_defs.h" without the pre-condition "#ifndef BIT", which will cause compile warning when using mesh. So we include the header file "soc/soc.h" in "mesh_util.h", which can bypass the definition of "BIT" in "mesh_util.h" when compiling. --- components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h index 78b9ddf7b2..7eebe71b46 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h @@ -15,6 +15,7 @@ #define _BLE_MESH_UTIL_H_ #include +#include "soc/soc.h" #include "mesh_types.h" #ifdef __cplusplus