Skip to content

Commit 740a944

Browse files
fabiobaltieriKhiemNguyenT
authored andcommitted
cmac, da1469x_hal: add define guards around min
Add define guards around the min definition so it does not colled with the upstream one. Signed-off-by: Fabio Baltieri <[email protected]>
1 parent d8ee5f1 commit 740a944

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

smartbond/cmac/mbox.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
#include <shm.h>
2424
#include <mbox.h>
2525

26+
#ifndef min
2627
#define min(a, b) (((a) < (b)) ? (a) : (b))
28+
#endif
2729

2830
static struct cmac_shm_mbox *
2931
mbox_src_get(uint16_t *size)

smartbond/da1469x_hal/da1469x_trimv.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
#include <da1469x_trimv.h>
2525
#include <da1469x_otp.h>
2626

27+
#ifndef min
2728
#define min(a, b) (((a) < (b)) ? (a) : (b))
29+
#endif
2830

2931
#define GROUP_ID_MAX (MCU_TRIMV_GROUP_ID_MAX)
3032

0 commit comments

Comments
 (0)