Просмотр исходного кода

Nimble: Removes global min/max definition causing problems with other libraries

Rahul Tank 3 лет назад
Родитель
Сommit
133b2e45e3

+ 1 - 1
components/bt/host/nimble/nimble

@@ -1 +1 @@
-Subproject commit 9a355b2b597a66868aed37e1ebccb0c274aaa252
+Subproject commit 56ff5b83337697895997a39bf6593255cdc37268

+ 8 - 0
examples/bluetooth/nimble/blemesh/main/app_mesh.c

@@ -43,6 +43,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;
 
 static int