From d4d4beb0d5f07c7a925885eb34deb1245df9d3db Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 May 2015 22:52:14 +0300 Subject: [PATCH] Fix issue with min/max fix #263 --- cores/esp8266/Arduino.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index dbc003b1d..767ea4f28 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -112,8 +112,6 @@ void timer1_write(uint32_t ticks); //maximum ticks 8388607 #undef abs #endif -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) #define abs(x) ((x)>0?(x):-(x)) #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt))) #define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5)) @@ -215,6 +213,9 @@ void loop(void); #include "Esp.h" #include "debug.h" +#define min(a,b) ((a)<(b)?(a):(b)) +#define max(a,b) ((a)>(b)?(a):(b)) + uint16_t makeWord(uint16_t w); uint16_t makeWord(byte h, byte l);