From 6d6a0eddc926379764daff2c8ef4e95b7f0603e9 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Tue, 22 Aug 2023 14:58:25 +0530 Subject: [PATCH] fix(nimble): Removed global min/max definition causing problems with other libraries --- components/bt/host/nimble/nimble | 2 +- examples/bluetooth/nimble/blemesh/main/app_mesh.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index ccf58a961f..6669d8b418 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit ccf58a961f13029c5b1ab0357eaafb3bc4712259 +Subproject commit 6669d8b418c7e483e1f750d354e462082ad695f9 diff --git a/examples/bluetooth/nimble/blemesh/main/app_mesh.c b/examples/bluetooth/nimble/blemesh/main/app_mesh.c index f033e6004c..c4ed5667b0 100644 --- 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;