diff options
Diffstat (limited to 'Middlewares/ST/STM32_WPAN/ble/ble_common.h')
| -rw-r--r-- | Middlewares/ST/STM32_WPAN/ble/ble_common.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Middlewares/ST/STM32_WPAN/ble/ble_common.h b/Middlewares/ST/STM32_WPAN/ble/ble_common.h index b464be9b4..db5bb1fa1 100644 --- a/Middlewares/ST/STM32_WPAN/ble/ble_common.h +++ b/Middlewares/ST/STM32_WPAN/ble/ble_common.h @@ -62,9 +62,13 @@ extern "C" { * Some useful macro definitions * * -------------------------------- */ -#define MAX( x, y ) (((x)>(y))?(x):(y)) +#ifndef MAX +#define MAX( a, b ) (((a) > (b)) ? (a) : (b)) +#endif -#define MIN( x, y ) (((x)<(y))?(x):(y)) +#ifndef MIN +#define MIN( a, b ) (((a) < (b)) ? (a) : (b)) +#endif #define MODINC( a, m ) M_BEGIN (a)++; if ((a)>=(m)) (a)=0; M_END |