From: Bram Moolenaar Date: Sat, 10 Aug 2019 12:54:20 +0000 (+0200) Subject: patch 8.1.1836: inaccurate memory estimate for Amiga-like OS X-Git-Tag: v8.1.1836 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9ab391a3a5283754ef216daacbaac446f1f9077;p=vim patch 8.1.1836: inaccurate memory estimate for Amiga-like OS Problem: Inaccurate memory estimate for Amiga-like OS. Solution: Adjust #ifdef for AvailMem(). (Ola Söder, closes #4797) --- 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 @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1836, /**/ 1835, /**/