From a9ab391a3a5283754ef216daacbaac446f1f9077 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 10 Aug 2019 14:54:20 +0200 Subject: [PATCH] patch 8.1.1836: inaccurate memory estimate for Amiga-like OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: Inaccurate memory estimate for Amiga-like OS. Solution: Adjust #ifdef for AvailMem(). (Ola Söder, closes #4797) --- src/os_amiga.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/os_amiga.c b/src/os_amiga.c index fbe33de209..dfc805374f 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 f10ea0896f..852595d922 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1836, /**/ 1835, /**/