From 637b9396d988bf80972fdab3bedcea8493fdad28 Mon Sep 17 00:00:00 2001
From: Carsten Larsen <cs@innolan.dk>
Date: Sat, 28 Jan 2017 19:06:45 +0100
Subject: [PATCH] Fix AROS build errors

---
 app/system/program_amiga.cpp | 8 +++++++-
 app/system/window_amiga.cpp  | 4 ++--
 lib/math.h                   | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 app/system/window_amiga.cpp

diff --git a/app/system/program_amiga.cpp b/app/system/program_amiga.cpp
index 197d88cd..2a810fe8 100644
--- a/app/system/program_amiga.cpp
+++ b/app/system/program_amiga.cpp
@@ -41,6 +41,12 @@
 #ifdef AMIGA
 #define ARGS_FORMAT "SHELL/S,INPUT/F"
 
+#ifdef AOS3
+# define RDPTR LONG*
+#else
+# define RDPTR IPTR*
+#endif
+
 AmigaProgram::AmigaProgram()
     : Program()
 {
@@ -68,7 +74,7 @@ void AmigaProgram::Initialize(int argc, char **argv)
         return;
     }
 
-    rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (IPTR)&args, 0);
+    rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (RDPTR)&args, 0);
     if (!rdargs)
     {
         PrintFault(IoErr(), (STRPTR)argv[0]);
diff --git a/app/system/window_amiga.cpp b/app/system/window_amiga.cpp
old mode 100755
new mode 100644
index 73f21307..1bf1110e
--- a/app/system/window_amiga.cpp
+++ b/app/system/window_amiga.cpp
@@ -81,8 +81,8 @@ void AmigaWindow::Create()
     };
 
     succeed = true;
-    succeed = succeed && (writeport = CreatePort(PORTCR, 0)) != 0;
-    succeed = succeed && (readport = CreatePort(PORTCW, 0)) != 0;
+    succeed = succeed && (writeport = CreatePort((char*)PORTCR, 0)) != 0;
+    succeed = succeed && (readport = CreatePort((char*)PORTCW, 0)) != 0;
     succeed = succeed && (writereq.st = CreateExtIO(writeport, sizeof(IOStdReq))) != 0;
     succeed = succeed && (readreq.st = CreateExtIO(readport, sizeof(IOStdReq))) != 0;
     succeed = succeed && (window = OpenWindow(&nw)) != 0;
diff --git a/lib/math.h b/lib/math.h
index 5bc25a07..0adaabbc 100644
--- a/lib/math.h
+++ b/lib/math.h
@@ -44,9 +44,13 @@
 
 #define PI         3.141592653589793238462643383279
 #define EULERS     2.718281828459045235360287471352
-#define sgn(x)     x > 0.0 ? 1.0 : x < 0.0 ? -1.0 : 0.0
+#define sgn(x)     (x > 0.0 ? 1.0 : x < 0.0 ? -1.0 : 0.0)
 #define log2p(x,y) log(x)/log(y)
 
+#ifdef AMIGA
+# define abs(x)    (x > 0 ? x : -x)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif