espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Nimble: Removes global min/max definition causing problems with other libraries(v4.4)

See merge request espressif/esp-idf!25472
This commit is contained in:
Rahul Tank
2023-08-25 01:17:12 +08:00
parent b9e8e0ef4e 6d6a0eddc9
commit bd5f10b1fd
2 changed files with 9 additions and 1 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: ccf58a961f...6669d8b418

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

@@ -44,6 +44,14 @@ static int recent_test_id = STANDARD_TEST_ID;
#define FAULT_ARR_SIZE 2
#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;