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
pull/12186/head
Rahul Tank 2023-08-25 01:17:12 +08:00
commit bd5f10b1fd
2 zmienionych plików z 9 dodań i 1 usunięć

@ -1 +1 @@
Subproject commit ccf58a961f13029c5b1ab0357eaafb3bc4712259
Subproject commit 6669d8b418c7e483e1f750d354e462082ad695f9

Wyświetl plik

@ -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;