espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble): Removed global min/max definition causing problems with other libraries

Browse Source
This commit is contained in:
Rahul Tank
2023-08-28 09:47:35 +05:30
parent 7bc232a647
commit 1d62bea80a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

Submodule components/bt/host/nimble/nimble updated: 8dda9024c9...6669d8b418

9
examples/bluetooth/nimble/blemesh/main/app_mesh.c
View File

@ -44,8 +44,15 @@ static int recent_test_id = STANDARD_TEST_ID;
#define FAULT_ARR_SIZE 2 #define FAULT_ARR_SIZE 2
static bool has_reg_fault = true; #ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
#ifndef max
#define max(a, b) ((a) > (b) ? (a) : (b))
#endif
static bool has_reg_fault = true;
static struct bt_mesh_cfg_srv cfg_srv = { static struct bt_mesh_cfg_srv cfg_srv = {
.relay = BT_MESH_RELAY_DISABLED, .relay = BT_MESH_RELAY_DISABLED,