diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-10 14:54:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-10 14:54:20 +0200 |
| commit | a9ab391a3a5283754ef216daacbaac446f1f9077 (patch) | |
| tree | 900a9d96ed9c14d24319c6f80b8c1d1f62f47c1a | |
| parent | fd8ca21b3ff207e44891aef922935d4adcd140cf (diff) | |
| download | vim-git-a9ab391a3a5283754ef216daacbaac446f1f9077.tar.gz | |
patch 8.1.1836: inaccurate memory estimate for Amiga-like OSv8.1.1836
Problem: Inaccurate memory estimate for Amiga-like OS.
Solution: Adjust #ifdef for AvailMem(). (Ola Söder, closes #4797)
| -rw-r--r-- | src/os_amiga.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |