Skip to content

Commit bd5f10b

Browse files
committed
Merge branch 'bugfix/remove_global_min_max_def_v4.4' into 'release/v4.4'
Nimble: Removes global min/max definition causing problems with other libraries(v4.4) See merge request espressif/esp-idf!25472
2 parents b9e8e0e + 6d6a0ed commit bd5f10b

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

examples/bluetooth/nimble/blemesh/main/app_mesh.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ static int recent_test_id = STANDARD_TEST_ID;
4444

4545
#define FAULT_ARR_SIZE 2
4646

47+
#ifndef min
48+
#define min(a, b) ((a) < (b) ? (a) : (b))
49+
#endif
50+
51+
#ifndef max
52+
#define max(a, b) ((a) > (b) ? (a) : (b))
53+
#endif
54+
4755
static bool has_reg_fault = true;
4856

4957

0 commit comments

Comments
 (0)