Index: Common.h =================================================================== diff -u -r9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0 -rd1dab1d15616dfcf804743cf07870e92f3c83649 --- Common.h (.../Common.h) (revision 9a59cef171550b5a9cb4f3028520c5d3f9d0c4c0) +++ Common.h (.../Common.h) (revision d1dab1d15616dfcf804743cf07870e92f3c83649) @@ -109,8 +109,6 @@ // **** Common Macros **** -#define ABS(v) ((v) < 0 ? (v) * -1 : (v)) -#define FABS(v) ((v) < 0.0 ? (v) * -1.0 : (v)) #define FLOAT_TO_INT_WITH_ROUND(f) ((f) < 0.0 ? (S32)((f) - FLOAT_TO_INT_ROUNDUP_OFFSET) : (S32)((f) + FLOAT_TO_INT_ROUNDUP_OFFSET)) ///< Macro converts a floating point value to an integer. #define CAP(v, u) ((v) > (u) ? (u) : (v)) ///< Macro caps a value to a maximum. #define RANGE(v, l, u) ((v) > (u) ? (u) : ((v) < (l) ? (l) : (v))) ///< Macro enforces a range on a value. @@ -177,14 +175,7 @@ #define _enable_IRQ() #define _disable_IRQ() #define _enable_FIQ() - -#ifdef _VC_OVERRIDE_MATH_ - #define fabs(v) ((v) < 0.0 ? ((v) * -1.0) : (v)) - extern F32 asin( F32 val ); - extern F32 sqrt( F32 val ); - extern F32 pow( F32 val, F32 exp ); #endif -#endif // include alarm mgmt header so any module can trigger an alarm #include "AlarmMgmt.h"