Merge pull request FabioBatSilva#15 from arduhe/clashmin

FabioBatSilva · web-flow · commit f7f2a51e640b · 2020-06-06T13:26:49.000-04:00
avoid clashes with std::min and std:max from STL
diff --git a/src/arduino/Arduino.h b/src/arduino/Arduino.h
@@ -88,8 +88,10 @@ void yield(void);
 #undef abs
 #endif
 
+#ifndef __cplusplus
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
+#endif
 #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))
