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
espressif · Aug 24, 2023 · bd5f10b · bd5f10b
2 parents b9e8e0e + 6d6a0ed
commit bd5f10b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
diff --git a/examples/bluetooth/nimble/blemesh/main/app_mesh.c b/examples/bluetooth/nimble/blemesh/main/app_mesh.c
@@ -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;