From 55539ae941bcf5a84ba6c53f1ea8bce145882424 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Tue, 20 Aug 2019 00:42:44 +0200 Subject: [PATCH] fix _min and _max macros (#6374) --- cores/esp8266/Arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index 518232ac6..82a183412 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -251,8 +251,8 @@ using std::max; using std::isinf; using std::isnan; -#define _min(a,b) ((a)<(b)?(a):(b)) -#define _max(a,b) ((a)>(b)?(a):(b)) +#define _min(a,b) ({ decltype(a) _a = (a); decltype(b) _b = (b); _a < _b? _a : _b; }) +#define _max(a,b) ({ decltype(a) _a = (a); decltype(b) _b = (b); _a > _b? _a : _b; }) uint16_t makeWord(uint16_t w); uint16_t makeWord(byte h, byte l);