alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_global_min_max_def_v4.3' into 'release/v4.3'

Browse Source 
fix(nimble): Removed global min/max definition causing problems with other libraries(v4.3)

See merge request espressif/esp-idf!25587
This commit is contained in:
Rahul Tank 2023-09-08 14:39:33 +08:00
commit d6d55aaf98
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

@ -1 +1 @@
Subproject commit 8dda9024c9d8ee5fb79e13f89210ce5e27ff8de4
Subproject commit 6669d8b418c7e483e1f750d354e462082ad695f9

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
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 = {
.relay = BT_MESH_RELAY_DISABLED,