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

Merge branch 'bugfix/remove_global_min_max_def_v5.0' into 'release/v5.0'

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

See merge request espressif/esp-idf!21817
This commit is contained in:
Jiang Jiang Jian
2023-02-27 15:11:28 +08:00
parent d4eebd5e80 72e637750e
commit 5ca38da869
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: 9a355b2b59...56ff5b8333

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

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