~ruther/qmk_firmware

1a33b5a479698e3ae80542c60963d2aa370566a6 — QMK Bot 3 years ago 774aa24 + f04336f
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 3 insertions(+), 1 deletions(-)

M tmk_core/protocol/midi/midi.c
M tmk_core/protocol/midi/midi.c => tmk_core/protocol/midi/midi.c +3 -1
@@ 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