Removed min/max instances from more files

nimble/host/mesh/src/adv.c

@@ -33,6 +33,13 @@ const uint8_t bt_mesh_adv_type[BT_MESH_ADV_TYPES] = {
 	[BT_MESH_ADV_BEACON] = BT_DATA_MESH_BEACON,
 	[BT_MESH_ADV_URI]    = BT_DATA_URI,
 };
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 extern uint8_t g_mesh_addr_type;
 

nimble/host/mesh/src/cfg_srv.c

@@ -33,6 +33,14 @@
 #include "settings.h"
 #include "cfg.h"
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 void (*bt_mesh_app_key_cb_list[1]) (uint16_t app_idx, uint16_t net_idx,
 			enum bt_mesh_key_evt evt);
 

nimble/host/mesh/src/glue.c

@@ -40,6 +40,14 @@ extern uint8_t g_mesh_addr_type;
 static struct ble_gap_adv_params ble_adv_cur_conf[2];
 #endif
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 const char *
 bt_hex(const void *buf, size_t len)
 {

nimble/host/mesh/src/transport.c

@@ -83,6 +83,13 @@ struct va_val {
 	uint16_t addr;
 	uint8_t  uuid[16];
 } __packed;
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 static struct seg_tx {
 	struct bt_mesh_subnet *sub;

nimble/host/src/ble_l2cap_coc.c

@@ -40,6 +40,14 @@ static os_membuf_t ble_l2cap_coc_srv_mem[
 
 static struct os_mempool ble_l2cap_coc_srv_pool;
 
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 static void
 ble_l2cap_coc_dbg_assert_srv_not_inserted(struct ble_l2cap_coc_srv *srv)
 {