summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author3araht <69518343+3araht@users.noreply.github.com>2022-08-30 04:18:53 +0900
committerGitHub <noreply@github.com>2022-08-29 12:18:53 -0700
commitf04336ff461a56799b79e5691f7b48e59f45ec08 (patch)
tree7b1179aceacde98c638ee603449297e2cb683003
parentde1d6b6f15ee9ab8b52747dcd98f45df8f5ee38a (diff)
downloadqmk_firmware-f04336ff461a56799b79e5691f7b48e59f45ec08.tar.gz
qmk_firmware-f04336ff461a56799b79e5691f7b48e59f45ec08.zip
Redefinition of MIN is avoided in midi.c (#18203)
-rw-r--r--tmk_core/protocol/midi/midi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/protocol/midi/midi.c b/tmk_core/protocol/midi/midi.c
index f3792552f4..1ba3e73a40 100644
--- a/tmk_core/protocol/midi/midi.c
+++ b/tmk_core/protocol/midi/midi.c
@@ -19,7 +19,9 @@
#include "midi.h"
#include <string.h> //for memcpy
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#ifndef MIN
+# define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#endif
#ifndef NULL
# define NULL 0