diff options
| author | 3araht <69518343+3araht@users.noreply.github.com> | 2022-08-30 04:18:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 12:18:53 -0700 |
| commit | f04336ff461a56799b79e5691f7b48e59f45ec08 (patch) | |
| tree | 7b1179aceacde98c638ee603449297e2cb683003 /tmk_core | |
| parent | de1d6b6f15ee9ab8b52747dcd98f45df8f5ee38a (diff) | |
Redefinition of MIN is avoided in midi.c (#18203)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/midi/midi.c | 4 |
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 @@ | |||
| 19 | #include "midi.h" | 19 | #include "midi.h" |
| 20 | #include <string.h> //for memcpy | 20 | #include <string.h> //for memcpy |
| 21 | 21 | ||
| 22 | #define MIN(x, y) (((x) < (y)) ? (x) : (y)) | 22 | #ifndef MIN |
| 23 | # define MIN(x, y) (((x) < (y)) ? (x) : (y)) | ||
| 24 | #endif | ||
| 23 | 25 | ||
| 24 | #ifndef NULL | 26 | #ifndef NULL |
| 25 | # define NULL 0 | 27 | # define NULL 0 |