From a88bc07769c1c9372188a22f595a1086e20b934d Mon Sep 17 00:00:00 2001 From: jflyper Date: Sun, 19 Jan 2020 05:33:19 +0900 Subject: [PATCH] [H7][LIB][USB] usbd_def: disable insane defs of MIN and MAX --- .../ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h b/lib/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h index 0463e2f31f..4ff35e74d8 100644 --- a/lib/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h +++ b/lib/main/STM32H7/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h @@ -319,8 +319,9 @@ __STATIC_INLINE uint16_t SWAPBYTE(uint8_t *addr) #define LOBYTE(x) ((uint8_t)((x) & 0x00FFU)) #define HIBYTE(x) ((uint8_t)(((x) & 0xFF00U) >> 8U)) -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) +// It's insane to define these here. +//#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +//#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #if defined ( __GNUC__ )