Merge remote-tracking branch 'origin/master' into develop

2022-08-29 19:19:56 +00:00 · 2022-08-29 19:19:56 +00:00 · 1a33b5a479
commit 1a33b5a479
parent 774aa2499d f04336ff46
1 changed files with 3 additions and 1 deletions
--- 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