summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-29 19:19:56 +0000
committerQMK Bot <hello@qmk.fm>2022-08-29 19:19:56 +0000
commit1a33b5a479698e3ae80542c60963d2aa370566a6 (patch)
tree5694384d61f2d3f7dcb64e93197e461d7ce454f5 /tmk_core/protocol
parent774aa2499dbb3caab949dddc66dd47b82b34fc27 (diff)
parentf04336ff461a56799b79e5691f7b48e59f45ec08 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
-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