summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2020-11-18 14:45:37 +0800
committerGitHub <[email protected]>2020-11-18 14:45:37 +0800
commite1e585a95a112141ee8dd1ec92c08d62d63e4a92 (patch)
tree15e00776e4ca6ba8aa489e0115eec38a9d0de6b9
parent2ef3c9d861f55253620996a94831a4be31ca6620 (diff)
parent3952fd780fb5647fde8221e6c74cab260eb3e285 (diff)
Merge pull request #4033 from Guozhanxin/rtt_master
[fix] When enable audio and usb at the same time. The warning <"MIN" …
-rw-r--r--components/drivers/audio/audio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/drivers/audio/audio.c b/components/drivers/audio/audio.c
index 4cec8a4a9c..846dad07cf 100644
--- a/components/drivers/audio/audio.c
+++ b/components/drivers/audio/audio.c
@@ -19,7 +19,9 @@
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
+#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
enum
{