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

fix(nimble): Removed global min/max definition causing problems with other libraries(v4.3) See merge request espressif/esp-idf!25587
espressif · Sep 8, 2023 · d6d55aa · d6d55aa
2 parents 7bc232a + 1d62bea
commit d6d55aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
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,8 +44,15 @@ static int recent_test_id = STANDARD_TEST_ID;
 
 #define FAULT_ARR_SIZE 2
 
-static bool has_reg_fault = true;
+#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 struct bt_mesh_cfg_srv cfg_srv = {
     .relay = BT_MESH_RELAY_DISABLED,