mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-17 17:35:30 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1a33b5a479
1 changed files with 3 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue