summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_amiga.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_amiga.c b/src/os_amiga.c
index fbe33de20..dfc805374 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -214,7 +214,7 @@ mch_char_avail(void)
long_u
mch_avail_mem(int special)
{
-#ifdef __amigaos4__
+#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__)
return (long_u)AvailMem(MEMF_ANY) >> 10;
#else
return (long_u)(AvailMem(special ? (long)MEMF_CHIP : (long)MEMF_ANY)) >> 10;
diff --git a/src/version.c b/src/version.c
index f10ea0896..852595d92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1836,
+/**/
1835,
/**/
1834,