rainlance
/
amath
mirror of https://gitlab.com/rnger/amath
1
0
Fork 0
Code Releases Wiki Activity

Fix AROS build errors

This commit is contained in:
Carsten Larsen 2017-01-28 19:06:45 +01:00
parent 56ed9b0d0d
commit 8696b1b40c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/system/program_amiga.cpp
View File

@ -41,6 +41,12 @@
#ifdef AMIGA #ifdef AMIGA
#define ARGS_FORMAT "SHELL/S,INPUT/F" #define ARGS_FORMAT "SHELL/S,INPUT/F"
#ifdef AOS3
# define RDPTR LONG*
#else
# define RDPTR IPTR*
#endif
AmigaProgram::AmigaProgram() AmigaProgram::AmigaProgram()
: Program() : Program()
{ {
@ -68,7 +74,7 @@ void AmigaProgram::Initialize(int argc, char **argv)
return; return;
} }
rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (IPTR)&args, 0); rdargs = (RDArgs*)ReadArgs((const char*)ARGS_FORMAT, (RDPTR)&args, 0);
if (!rdargs) if (!rdargs)
{ {
PrintFault(IoErr(), (STRPTR)argv[0]); PrintFault(IoErr(), (STRPTR)argv[0]);

4
app/system/window_amiga.cpp Executable file → Normal file
View File

@ -81,8 +81,8 @@ void AmigaWindow::Create()
}; };
succeed = true; succeed = true;
succeed = succeed && (writeport = CreatePort(PORTCR, 0)) != 0; succeed = succeed && (writeport = CreatePort((char*)PORTCR, 0)) != 0;
succeed = succeed && (readport = CreatePort(PORTCW, 0)) != 0; succeed = succeed && (readport = CreatePort((char*)PORTCW, 0)) != 0;
succeed = succeed && (writereq.st = CreateExtIO(writeport, sizeof(IOStdReq))) != 0; succeed = succeed && (writereq.st = CreateExtIO(writeport, sizeof(IOStdReq))) != 0;
succeed = succeed && (readreq.st = CreateExtIO(readport, sizeof(IOStdReq))) != 0; succeed = succeed && (readreq.st = CreateExtIO(readport, sizeof(IOStdReq))) != 0;
succeed = succeed && (window = OpenWindow(&nw)) != 0; succeed = succeed && (window = OpenWindow(&nw)) != 0;

6
lib/math.h
View File

@ -44,9 +44,13 @@
#define PI 3.141592653589793238462643383279 #define PI 3.141592653589793238462643383279
#define EULERS 2.718281828459045235360287471352 #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) #define log2p(x,y) log(x)/log(y)
#ifdef AMIGA
# define abs(x) (x > 0 ? x : -x)
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif