From 1935f63cd6835714b5a66799267123270e35263c Mon Sep 17 00:00:00 2001 From: David Brown Date: Wed, 2 Nov 2016 12:59:51 +0000 Subject: [PATCH] Fix ABS in SYSTEM.h and fix tools/make/ignore. --- src/runtime/SYSTEM.h | 2 +- src/tools/make/ignore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/SYSTEM.h b/src/runtime/SYSTEM.h index cb7c8815..4600fe8b 100644 --- a/src/runtime/SYSTEM.h +++ b/src/runtime/SYSTEM.h @@ -202,7 +202,7 @@ extern int64 SYSTEM_ENTIER (double x); static inline int32 SYSTEM_ABS64(int64 i) {return i >= 0 ? i : -i;} static inline int64 SYSTEM_ABS32(int32 i) {return i >= 0 ? i : -i;} -#define __ABSF(x) ((sizeof(x) <= 4) ? SYSTEM_ABS32(i) : SYSTEM_ABS64(i)) +#define __ABSF(x) ((sizeof(x) <= 4) ? SYSTEM_ABS32(x) : SYSTEM_ABS64(x)) static inline double SYSTEM_ABSD(double i) {return i >= 0.0 ? i : -i;} #define __ABSFD(x) SYSTEM_ABSD(x) diff --git a/src/tools/make/ignore b/src/tools/make/ignore index f25566d8..1f2cafbe 100644 --- a/src/tools/make/ignore +++ b/src/tools/make/ignore @@ -4,4 +4,4 @@ OPM_ResourceDir __MOVE.* cmd, OPM_(IntSize|PointerSize|Alignment) = Strings_Append.+void\*\)(cmd|OPM_OBERON|extTools_comp) -__COPY\("(gcc|clang|msc|i686-w64-mingw \ No newline at end of file +__COPY\("(gcc|clang|msc|i686-w64-mingw)