Skip to content

Commit 07ecca1

Browse files
committed
Fix issue with min/max
fix #263
1 parent d69c378 commit 07ecca1

File tree

1 file changed

+3
-2
lines changed
  • hardware/esp8266com/esp8266/cores/esp8266

1 file changed

+3
-2
lines changed

hardware/esp8266com/esp8266/cores/esp8266/Arduino.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ void timer1_write(uint32_t ticks); //maximum ticks 8388607
112112
#undef abs
113113
#endif
114114

115-
#define min(a,b) ((a)<(b)?(a):(b))
116-
#define max(a,b) ((a)>(b)?(a):(b))
117115
#define abs(x) ((x)>0?(x):-(x))
118116
#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
119117
#define round(x) ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
@@ -215,6 +213,9 @@ void loop(void);
215213
#include "Esp.h"
216214
#include "debug.h"
217215

216+
#define min(a,b) ((a)<(b)?(a):(b))
217+
#define max(a,b) ((a)>(b)?(a):(b))
218+
218219
uint16_t makeWord(uint16_t w);
219220
uint16_t makeWord(byte h, byte l);
220221

0 commit comments

Comments
 (0)