From d2f85af5e57a527cfbe4f60a4e8d6e8a8c2b73db Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Fri, 23 Mar 2012 13:49:24 +0000 Subject: [PATCH] Don't try to define abs() on linux, stdlib will handle it. --- cde/programs/dticon/constants.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cde/programs/dticon/constants.h b/cde/programs/dticon/constants.h index a2972ed37..9b4be16c8 100644 --- a/cde/programs/dticon/constants.h +++ b/cde/programs/dticon/constants.h @@ -97,8 +97,10 @@ typedef struct { #define min(a, b) ((a < b) ? a : b) #define max(a, b) ((a > b) ? a : b) #ifndef abs +#if !defined(linux) #define abs(a) (((a) < 0) ? -(a) : (a)) #endif +#endif #define mag(a,b) ((a-b) < 0 ? (b-a) : (a-b)) #define DARK 0