mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
ble_mesh: A specific fix for compile warning in idf3.3
- Remove the extra #include "bt_common.h" in mesh_timer.c - Compared with the latest idf, idf3.3 defines BIT(nr) in the "soc/soc.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.
This commit is contained in:
@ -15,6 +15,7 @@
|
||||
#define _BLE_MESH_UTIL_H_
|
||||
|
||||
#include <stddef.h>
|
||||
#include "soc/soc.h"
|
||||
#include "mesh_types.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -14,7 +14,6 @@
|
||||
|
||||
#include "mesh_common.h"
|
||||
#include "provisioner_prov.h"
|
||||
#include "bt_common.h"
|
||||
|
||||
static hash_map_t *bm_alarm_hash_map;
|
||||
static const size_t BLE_MESH_GENERAL_ALARM_HASH_MAP_SIZE = 20 + CONFIG_BLE_MESH_PBA_SAME_TIME + \
|
||||
|
Reference in New Issue
Block a user