From 3589d6c230308dadb7c102a48da14393e721d4e7 Mon Sep 17 00:00:00 2001 From: Jonathan BAUDIN <jonathan.baudin@atmel.com> Date: Thu, 15 May 2014 18:08:56 +0200 Subject: [PATCH] Fix abs define --- cores/arduino/wiring_constants.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cores/arduino/wiring_constants.h b/cores/arduino/wiring_constants.h index aac3734d..d4ae2156 100644 --- a/cores/arduino/wiring_constants.h +++ b/cores/arduino/wiring_constants.h @@ -59,9 +59,11 @@ enum BitOrder { #define EXTERNAL 0 // undefine stdlib's abs if encountered -#ifdef abs -#undef abs -#endif // abs + +//#ifdef abs +//#undef abs +//#endif // abs + #ifndef min #define min(a,b) ((a)<(b)?(a):(b)) @@ -71,7 +73,7 @@ enum BitOrder { #define max(a,b) ((a)>(b)?(a):(b)) #endif // max -#define abs(x) ((x)>0?(x):-(x)) +//#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)) #define radians(deg) ((deg)*DEG_TO_RAD) -- GitLab